diff options
Diffstat (limited to 'core/src/fpdftext/fpdf_text_int.cpp')
-rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index f02ca41e1a..0754757940 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include <ctype.h> +#include <cctype> +#include <cwctype> #include <algorithm> #include "core/include/fpdfapi/fpdf_module.h" @@ -2446,8 +2447,8 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat) { FX_BOOL CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos) { - int char_left = 0; - int char_right = 0; + FX_WCHAR char_left = 0; + FX_WCHAR char_right = 0; int char_count = endPos - startPos + 1; if (char_count < 1) { return FALSE; @@ -2463,12 +2464,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::iswdigit(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::iswdigit(char_right)) { return FALSE; } if (!(('A' > char_left || char_left > 'Z') && |