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 | af00d95fc02843ba3cae8d7d076fd43a171d6afd (patch) | |
| tree | b4ecfa3fdb9f4bf72cc06d484befc83e900056b3 /win32/PlatWin.cxx | |
| parent | 3fb1bc5789348d9f9a8bc7868c20ab5ba6b41a41 (diff) | |
| download | scintilla-mirror-af00d95fc02843ba3cae8d7d076fd43a171d6afd.tar.gz | |
Remove variables and casts that are not needed.
Diffstat (limited to 'win32/PlatWin.cxx')
| -rw-r--r-- | win32/PlatWin.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index a74a21238..4f7d59562 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -982,9 +982,8 @@ void SurfaceGDI::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION * return; } // Map the widths given for UTF-16 characters back onto the UTF-8 input string - const unsigned char *us = reinterpret_cast<const unsigned char *>(s); for (int ui = 0; ui < fit; ui++) { - const unsigned char uch = us[i]; + const unsigned char uch = s[i]; const unsigned int byteCount = UTF8BytesOfLead[uch]; if (byteCount == 4) { // Non-BMP ui++; @@ -1654,10 +1653,9 @@ void SurfaceD2D::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION * if (unicodeMode) { // Map the widths given for UTF-16 characters back onto the UTF-8 input string int ui=0; - const unsigned char *us = reinterpret_cast<const unsigned char *>(s); int i=0; while (ui<tbuf.tlen) { - const unsigned char uch = us[i]; + const unsigned char uch = s[i]; const unsigned int byteCount = UTF8BytesOfLead[uch]; if (byteCount == 4) { // Non-BMP ui++; |