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_int.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_int.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 9ab09e19e4..4459552c84 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -2433,12 +2433,11 @@ FX_BOOL CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, } if ((char_left > 'A' && char_left < 'a') || (char_left > 'a' && char_left < 'z') || - (char_left > 0xfb00 && char_left < 0xfb06) || - (char_left >= '0' && char_left <= '9') || + (char_left > 0xfb00 && char_left < 0xfb06) || std::isdigit(char_left) || (char_right > 'A' && char_right < 'a') || (char_right > 'a' && char_right < 'z') || (char_right > 0xfb00 && char_right < 0xfb06) || - (char_right >= '0' && char_right <= '9')) { + std::isdigit(char_right)) { return FALSE; } if (!(('A' > char_left || char_left > 'Z') && |