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/src/fpdftext/fpdf_text.cpp | |
| 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/src/fpdftext/fpdf_text.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 55ab483722..0b7a849c75 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -14,6 +14,9 @@ #include "third_party/base/nonstd_unique_ptr.h" #include "txtproc.h" +#include <cctype> +#include <cwctype> + CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode, int destcp, const FX_CHAR* defchar) { @@ -436,10 +439,9 @@ void NormalizeString(CFX_WideString& str) { static FX_BOOL IsNumber(CFX_WideString& str) { for (int i = 0; i < str.GetLength(); i++) { FX_WCHAR ch = str[i]; - if ((ch < '0' || ch > '9') && ch != '-' && ch != '+' && ch != '.' && - ch != ' ') { + // TODO(dsinclair): --.+ +.-- should probably not be a number. + if (!std::iswdigit(ch) && ch != '-' && ch != '+' && ch != '.' && ch != ' ') return FALSE; - } } return TRUE; } |