From 3c82cfba7bd67e03a70fb24e9e7940b7ffc251d0 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 25 Apr 2018 17:42:11 +1000
Subject: Backport: Remove variables and casts that are not needed.

Backport of changeset 6739:e204054d5d07.
---
 cocoa/PlatCocoa.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cocoa')

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index ac147b6b5..cef776c7f 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -952,10 +952,10 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION
 		// Map the widths given for UTF-16 characters back onto the UTF-8 input string
 		CFIndex fit = textLayout->getStringLength();
 		int ui=0;
-		const unsigned char *us = reinterpret_cast<const unsigned char *>(s);
 		int i=0;
 		while (ui<fit) {
-			const unsigned int byteCount = UTF8BytesOfLead[us[i]];
+			const unsigned char uch = s[i];
+			const unsigned int byteCount = UTF8BytesOfLead[uch];
 			const int codeUnits = UTF16LengthFromUTF8ByteCount(byteCount);
 			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, ui+codeUnits, NULL);
 			for (unsigned int bytePos=0; (bytePos<byteCount) && (i<len); bytePos++) {
-- 
cgit v1.2.3