diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-04-25 17:42:11 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-04-25 17:42:11 +1000 |
| commit | 3c82cfba7bd67e03a70fb24e9e7940b7ffc251d0 (patch) | |
| tree | 55a69aba695cde5ca7f065dec206d46cac5dee3e /cocoa/PlatCocoa.mm | |
| parent | fdc720a5a23e10a6b7ff4f51362db9ed5181aa8d (diff) | |
| download | scintilla-mirror-3c82cfba7bd67e03a70fb24e9e7940b7ffc251d0.tar.gz | |
Backport: Remove variables and casts that are not needed.
Backport of changeset 6739:e204054d5d07.
Diffstat (limited to 'cocoa/PlatCocoa.mm')
| -rw-r--r-- | cocoa/PlatCocoa.mm | 4 |
1 files changed, 2 insertions, 2 deletions
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++) { |