diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-11-03 14:54:35 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-11-03 14:54:35 -0500 |
| commit | e0e922db5fb77df9a5a9cc802096f484ed21da1c (patch) | |
| tree | d6b3da42c1a28ec150c5cb9fe6b00d8f6af099d5 /fpdfsdk/src/javascript/PublicMethods.cpp | |
| parent | c9e76c09b9e7901823ac52a3705da235bd2abe24 (diff) | |
| download | pdfium-e0e922db5fb77df9a5a9cc802096f484ed21da1c.tar.xz | |
Revert "Revert "Cleanup some numeric code.""
This reverts commit 23d576f0b498bd4f37ef2175916223a2e5ea0324.
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.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1405253007 .
Diffstat (limited to 'fpdfsdk/src/javascript/PublicMethods.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/PublicMethods.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index e898214cd8..7ede42db13 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -6,6 +6,7 @@ #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" @@ -116,7 +117,7 @@ FX_BOOL CJS_PublicMethods::IsDigit(wchar_t ch) { } FX_BOOL CJS_PublicMethods::IsDigit(char ch) { - return (ch >= '0' && ch <= '9'); + return std::isdigit(ch); } FX_BOOL CJS_PublicMethods::IsAlphabetic(wchar_t ch) { @@ -396,7 +397,7 @@ int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& string, FX_WCHAR c = string.GetAt(i); if (IsDigit((wchar_t)c)) { - nRet = nRet * 10 + (c - '0'); + nRet = nRet * 10 + FXSYS_toDecimalDigit(c); nSkip = i - nStart + 1; if (nSkip >= nMaxStep) break; |