diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-11-16 13:09:00 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-11-16 13:09:00 -0500 |
| commit | 10cfea1fdafc8fcf1edd60bc783e9db9ef6229c0 (patch) | |
| tree | 3cd1bc8e6a6b33391ea8ad83388a07ca4974f40b /core/include | |
| parent | ec441e67745054ece5e3d736b60fffa2f7f8d20c (diff) | |
| download | pdfium-10cfea1fdafc8fcf1edd60bc783e9db9ef6229c0.tar.xz | |
Merge to XFA: Reland "Cleanup some numeric code.""
This reverts commit 0569ab0b11b723d9bca4ddd642b0cf8828c4bdd1.
This changes the various comparisons of char >= '0' && char <= '9' and
char < '0' || char > '9' to use std::isdigit checks. It also cleans up
a handful of hex to digit conversions to call one common method.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1449873003 .
(cherry picked from commit 3f148915d12f54a946a0c0bf526162b79c39d650)
Review URL: https://codereview.chromium.org/1452673002 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fxcrt/fx_ext.h | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h index 0853c89531..d36ecfde4e 100644 --- a/core/include/fxcrt/fx_ext.h +++ b/core/include/fxcrt/fx_ext.h @@ -10,9 +10,8 @@ #include "fx_string.h" #include "fx_system.h" -#ifdef __cplusplus -extern "C" { -#endif +#include <cctype> +#include <cwctype> FX_FLOAT FXSYS_tan(FX_FLOAT a); FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x); @@ -39,6 +38,25 @@ inline int32_t FXSYS_toupper(int32_t ch) { return ch < 'a' || ch > 'z' ? ch : (ch - 0x20); } +inline int FXSYS_toHexDigit(const FX_CHAR c) { + if (!std::isxdigit(c)) + return 0; + char upchar = std::toupper(c); + return upchar > '9' ? upchar - 'A' + 10 : upchar - '0'; +} + +inline int FXSYS_toDecimalDigit(const FX_CHAR c) { + if (!std::isdigit(c)) + return 0; + return c - '0'; +} + +inline int FXSYS_toDecimalDigitWide(const FX_WCHAR c) { + if (!std::iswdigit(c)) + return 0; + return c - L'0'; +} + FX_DWORD FX_HashCode_String_GetA(const FX_CHAR* pStr, int32_t iLength, FX_BOOL bIgnoreCase = FALSE); @@ -46,13 +64,6 @@ FX_DWORD FX_HashCode_String_GetW(const FX_WCHAR* pStr, int32_t iLength, FX_BOOL bIgnoreCase = FALSE); -#ifdef __cplusplus -} -#endif -#ifdef __cplusplus -extern "C" { -#endif - void* FX_Random_MT_Start(FX_DWORD dwSeed); FX_DWORD FX_Random_MT_Generate(void* pContext); @@ -64,12 +75,6 @@ void FX_Random_GenerateBase(FX_DWORD* pBuffer, int32_t iCount); void FX_Random_GenerateMT(FX_DWORD* pBuffer, int32_t iCount); void FX_Random_GenerateCrypto(FX_DWORD* pBuffer, int32_t iCount); -#ifdef __cplusplus -} -#endif -#ifdef __cplusplus -extern "C" { -#endif typedef struct FX_GUID { FX_DWORD data1; @@ -84,9 +89,7 @@ void FX_GUID_CreateV4(FX_LPGUID pGUID); void FX_GUID_ToString(FX_LPCGUID pGUID, CFX_ByteString& bsStr, FX_BOOL bSeparator = TRUE); -#ifdef __cplusplus -} -#endif + template <class baseType> class CFX_SSortTemplate { public: |