summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-07-28 12:28:08 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-07-28 19:52:52 +0000
commitf0e9c849a3fd4efec3d7ee57fc4889814c45b0cd (patch)
treedf590aef0b7e488400807edba19007ada5d43ee0
parent05590922d4d33f0306ca5065946526580150dd8a (diff)
downloadpdfium-chromium/3171.tar.xz
Use FX_GetUnicodeProperties() in more places.chromium/3173chromium/3172chromium/3171
Instead of accessing the raw kTextLayoutCodeProperties data. Change-Id: Ie39cf5c098e1564ae2f18d76b234af42f24db4ca Reviewed-on: https://pdfium-review.googlesource.com/9451 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Nicolás Peña <npm@chromium.org>
-rw-r--r--core/fxcrt/fx_arabic.cpp6
-rw-r--r--core/fxcrt/fx_unicode.cpp2
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak.cpp2
3 files changed, 5 insertions, 5 deletions
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<uint16_t>(wch)]);
- CFX_Char p(prev, kTextLayoutCodeProperties[static_cast<uint16_t>(prev)]);
- CFX_Char n(next, kTextLayoutCodeProperties[static_cast<uint16_t>(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<size_t>(wch);
if (idx < kTextLayoutCodePropertiesSize)
- return kTextLayoutCodeProperties[(uint16_t)wch];
+ return kTextLayoutCodeProperties[idx];
return 0;
}
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp
index fdb492d44b..353bdbacdf 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak.cpp
@@ -66,7 +66,7 @@ bool CFX_RTFBreak::GetPositionedTab(int32_t* iTabPos) const {
CFX_BreakType CFX_RTFBreak::AppendChar(wchar_t wch) {
ASSERT(m_pFont && m_pCurLine);
- uint32_t dwProps = kTextLayoutCodeProperties[static_cast<uint16_t>(wch)];
+ uint32_t dwProps = FX_GetUnicodeProperties(wch);
FX_CHARTYPE chartype = GetCharTypeFromProp(dwProps);
m_pCurLine->m_LineChars.emplace_back();