diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
| commit | 8d2aae7ee320da3a8ffe01c57e38b3f98443257d (patch) | |
| tree | e694c6f82ec72fa46e6172b4475996b30d3f6a3a /core/src/fxcrt/fx_unicode.cpp | |
| parent | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (diff) | |
| download | pdfium-8d2aae7ee320da3a8ffe01c57e38b3f98443257d.tar.xz | |
Revert "FX Bool considered harmful, part 3"
This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255293002 .
Diffstat (limited to 'core/src/fxcrt/fx_unicode.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_unicode.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fxcrt/fx_unicode.cpp b/core/src/fxcrt/fx_unicode.cpp index 1d63da93aa..d66a58a9b3 100644 --- a/core/src/fxcrt/fx_unicode.cpp +++ b/core/src/fxcrt/fx_unicode.cpp @@ -13,27 +13,27 @@ FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) { return gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; } -bool FX_IsCtrlCode(FX_WCHAR ch) +FX_BOOL FX_IsCtrlCode(FX_WCHAR ch) { FX_DWORD dwRet = (gs_FX_TextLayout_CodeProperties[(FX_WORD)ch] & FX_CHARTYPEBITSMASK); return dwRet == FX_CHARTYPE_Tab || dwRet == FX_CHARTYPE_Control; } -bool FX_IsRotationCode(FX_WCHAR ch) +FX_BOOL FX_IsRotationCode(FX_WCHAR ch) { return (gs_FX_TextLayout_CodeProperties[(FX_WORD)ch] & 0x8000) != 0; } -bool FX_IsCombinationChar(FX_WCHAR wch) +FX_BOOL FX_IsCombinationChar(FX_WCHAR wch) { FX_DWORD dwProps = (gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK); return dwProps == FX_CHARTYPE_Combination; } -bool FX_IsBidiChar(FX_WCHAR wch) +FX_BOOL FX_IsBidiChar(FX_WCHAR wch) { FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; int32_t iBidiCls = (dwProps & FX_BIDICLASSBITSMASK) >> FX_BIDICLASSBITS; return (FX_BIDICLASS_R == iBidiCls || FX_BIDICLASS_AL == iBidiCls); } -FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, bool bRTL, bool bVertical) +FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical) { FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; FX_DWORD dwTemp = (dwProps & 0xFF800000); @@ -49,7 +49,7 @@ FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, bool bRTL, bool bVertical) } return wch; } -FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, bool bRTL, bool bVertical) +FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, FX_BOOL bVertical) { FX_DWORD dwTemp = (dwProps & 0xFF800000); if (bRTL && dwTemp < 0xFF800000) { |