diff options
| author | dan sinclair <dsinclair@chromium.org> | 2015-11-10 13:33:04 -0500 |
|---|---|---|
| committer | dan sinclair <dsinclair@chromium.org> | 2015-11-10 13:33:04 -0500 |
| commit | 0569ab0b11b723d9bca4ddd642b0cf8828c4bdd1 (patch) | |
| tree | d0f6ba295574785c773536be7b5526680ed60f04 /fpdfsdk/src/javascript/PublicMethods.cpp | |
| parent | e6e16954f0cdc324849fca9da883be8f131b3834 (diff) | |
| download | pdfium-0569ab0b11b723d9bca4ddd642b0cf8828c4bdd1.tar.xz | |
Revert x4 "Cleanup some numeric code."
This reverts commit b27902b8995bb3e003daed6b0811ed746763c68d.
Cleanup some numeric code.
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.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1432973003 .
Diffstat (limited to 'fpdfsdk/src/javascript/PublicMethods.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/PublicMethods.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index 8e8cb21c60..92b47666e2 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -6,7 +6,6 @@ #include "PublicMethods.h" -#include "../../../core/include/fxcrt/fx_ext.h" #include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "../../include/javascript/IJavaScript.h" #include "Field.h" @@ -117,7 +116,7 @@ FX_BOOL CJS_PublicMethods::IsDigit(wchar_t ch) { } FX_BOOL CJS_PublicMethods::IsDigit(char ch) { - return std::isdigit(ch); + return (ch >= '0' && ch <= '9'); } FX_BOOL CJS_PublicMethods::IsAlphabetic(wchar_t ch) { @@ -397,7 +396,7 @@ int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& string, FX_WCHAR c = string.GetAt(i); if (IsDigit((wchar_t)c)) { - nRet = nRet * 10 + FXSYS_toDecimalDigitWide(c); + nRet = nRet * 10 + (c - '0'); nSkip = i - nStart + 1; if (nSkip >= nMaxStep) break; |