| Index: core/fxcrt/fx_unicode.cpp
|
| diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
|
| index 296ead84bbb5cf152769e387afe9edd93f81c8ca..d042283a3274bdbf84f9e1cd6ccc8649c8142fc1 100644
|
| --- a/core/fxcrt/fx_unicode.cpp
|
| +++ b/core/fxcrt/fx_unicode.cpp
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "core/fxcrt/include/fx_ucd.h"
|
|
|
| -FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) {
|
| +uint32_t FX_GetUnicodeProperties(FX_WCHAR wch) {
|
| size_t idx = static_cast<size_t>(wch);
|
| if (idx < kTextLayoutCodePropertiesSize)
|
| return kTextLayoutCodeProperties[(uint16_t)wch];
|
| @@ -15,14 +15,14 @@ FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) {
|
|
|
| #ifdef PDF_ENABLE_XFA
|
| FX_BOOL FX_IsCtrlCode(FX_WCHAR ch) {
|
| - FX_DWORD dwRet = (FX_GetUnicodeProperties(ch) & FX_CHARTYPEBITSMASK);
|
| + uint32_t dwRet = (FX_GetUnicodeProperties(ch) & FX_CHARTYPEBITSMASK);
|
| return dwRet == FX_CHARTYPE_Tab || dwRet == FX_CHARTYPE_Control;
|
| }
|
| #endif // PDF_ENABLE_XFA
|
|
|
| FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical) {
|
| - FX_DWORD dwProps = FX_GetUnicodeProperties(wch);
|
| - FX_DWORD dwTemp = (dwProps & 0xFF800000);
|
| + uint32_t dwProps = FX_GetUnicodeProperties(wch);
|
| + uint32_t dwTemp = (dwProps & 0xFF800000);
|
| if (bRTL && dwTemp < 0xFF800000) {
|
| size_t idx = dwTemp >> 23;
|
| if (idx < kFXTextLayoutBidiMirrorSize) {
|
| @@ -43,10 +43,10 @@ FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical) {
|
|
|
| #ifdef PDF_ENABLE_XFA
|
| FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch,
|
| - FX_DWORD dwProps,
|
| + uint32_t dwProps,
|
| FX_BOOL bRTL,
|
| FX_BOOL bVertical) {
|
| - FX_DWORD dwTemp = (dwProps & 0xFF800000);
|
| + uint32_t dwTemp = (dwProps & 0xFF800000);
|
| if (bRTL && dwTemp < 0xFF800000) {
|
| size_t idx = dwTemp >> 23;
|
| if (idx < kFXTextLayoutBidiMirrorSize) {
|
|
|