From f0e9c849a3fd4efec3d7ee57fc4889814c45b0cd Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 28 Jul 2017 12:28:08 -0700 Subject: Use FX_GetUnicodeProperties() in more places. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of accessing the raw kTextLayoutCodeProperties data. Change-Id: Ie39cf5c098e1564ae2f18d76b234af42f24db4ca Reviewed-on: https://pdfium-review.googlesource.com/9451 Commit-Queue: Lei Zhang Reviewed-by: Nicolás Peña --- core/fxcrt/fx_arabic.cpp | 6 +++--- core/fxcrt/fx_unicode.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp index 79d6be2346..095db8d728 100644 --- a/core/fxcrt/fx_arabic.cpp +++ b/core/fxcrt/fx_arabic.cpp @@ -667,9 +667,9 @@ namespace pdfium { namespace arabic { wchar_t GetFormChar(wchar_t wch, wchar_t prev, wchar_t next) { - CFX_Char c(wch, kTextLayoutCodeProperties[static_cast(wch)]); - CFX_Char p(prev, kTextLayoutCodeProperties[static_cast(prev)]); - CFX_Char n(next, kTextLayoutCodeProperties[static_cast(next)]); + CFX_Char c(wch, FX_GetUnicodeProperties(wch)); + CFX_Char p(prev, FX_GetUnicodeProperties(prev)); + CFX_Char n(next, FX_GetUnicodeProperties(next)); return GetFormChar(&c, &p, &n); } diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp index 595bb65a63..f23200491a 100644 --- a/core/fxcrt/fx_unicode.cpp +++ b/core/fxcrt/fx_unicode.cpp @@ -24,7 +24,7 @@ wchar_t GetMirrorChar(wchar_t wch, uint32_t dwProps) { uint32_t FX_GetUnicodeProperties(wchar_t wch) { size_t idx = static_cast(wch); if (idx < kTextLayoutCodePropertiesSize) - return kTextLayoutCodeProperties[(uint16_t)wch]; + return kTextLayoutCodeProperties[idx]; return 0; } -- cgit v1.2.3