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 /core/src/fpdftext/fpdf_text.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 'core/src/fpdftext/fpdf_text.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 9ecbc21bda..e9ad338025 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -436,10 +436,8 @@ 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 != ' ') { + if (!std::isdigit(ch) && ch != '-' && ch != '+' && ch != '.' && ch != ' ') return FALSE; - } } return TRUE; } |