Chromium Code Reviews| Index: fpdfsdk/src/javascript/PublicMethods.cpp |
| diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp |
| index e898214cd85d47ee827716955b4709c74b03e628..7ede42db13f6830b7988c822e9ac4e5d3caba19c 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); |
|
dsinclair
2015/11/04 20:16:24
Changed to DigitWide.
|
| nSkip = i - nStart + 1; |
| if (nSkip >= nMaxStep) |
| break; |