summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-11-16 12:28:39 -0500
committerDan Sinclair <dsinclair@chromium.org>2015-11-16 12:28:39 -0500
commit3f148915d12f54a946a0c0bf526162b79c39d650 (patch)
tree17a95f27c8a6a07356b68ac41b5fbcc0f2358ab9 /core/include
parent76c6d639f46c37ba955569f507201eb3f1b613fc (diff)
downloadpdfium-3f148915d12f54a946a0c0bf526162b79c39d650.tar.xz
Reland "Cleanup some numeric code.""chromium/2567
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 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxcrt/fx_ext.h37
1 files changed, 23 insertions, 14 deletions
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index c24955fb7c..f13d37caf4 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -7,11 +7,10 @@
#ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
#define CORE_INCLUDE_FXCRT_FX_EXT_H_
-#include "fx_system.h"
+#include <cctype>
+#include <cwctype>
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "fx_system.h"
FX_FLOAT FXSYS_tan(FX_FLOAT a);
FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x);
@@ -38,6 +37,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);
@@ -45,13 +63,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);
@@ -63,9 +74,7 @@ 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
+
template <class baseType>
class CFX_SSortTemplate {
public: