From c597d73ba23375ab2b86489e0818aad7a86e402b Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Fri, 12 Apr 2019 08:22:21 +1000
Subject: Bug [#2093]. Improve efficiency with single byte character sets.

---
 win32/PlatWin.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index d1ff19b55..709c876b4 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -1194,7 +1194,7 @@ void SurfaceD2D::SetFont(Font &font_) {
 	yDescent = pfm->yDescent;
 	yInternalLeading = pfm->yInternalLeading;
 	codePageText = codePage;
-	if (pfm->characterSet) {
+	if (!unicodeMode && pfm->characterSet) {
 		codePageText = Scintilla::CodePageFromCharSet(pfm->characterSet, codePage);
 	}
 	if (pRenderTarget) {
@@ -2021,7 +2021,7 @@ void SurfaceD2D::MeasureWidths(Font &font_, std::string_view text, XYPOSITION *p
 		while (i<text.length()) {
 			positions[i++] = lastPos;
 		}
-	} else if (codePageText == 0) {
+	} else if (!IsDBCSCodePage(codePageText)) {
 
 		// One char per position
 		PLATFORM_ASSERT(text.length() == static_cast<size_t>(tbuf.tlen));
-- 
cgit v1.2.3