diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-03-12 19:25:55 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-12 19:25:55 +0000 |
| commit | 0c6b98182403868334b4dfe4852caa4d0e2ba272 (patch) | |
| tree | d336db128fee55372ae35306f8d418e5b0ac7d1b | |
| parent | 83a01491dbd91e31c9d9417b8b975259a0fb3aec (diff) | |
| download | pdfium-chromium/3369.tar.xz | |
Remove all usages of FXSYS_iswASCIIspacechromium/3369
This replaces it with FXSYS_iswspace, which uses ICU to perform
correct Unicode space checking.
BUG=pdfium:1035
Change-Id: I7a4ed01a6b50f56a6f9d1434a7f0b01596fe42db
Reviewed-on: https://pdfium-review.googlesource.com/28510
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
| -rw-r--r-- | core/fxcrt/fx_extension.h | 4 | ||||
| -rw-r--r-- | core/fxge/dib/fx_dib_main.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_localevalue.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcrt/fx_extension.h b/core/fxcrt/fx_extension.h index fd7b78afdb..8e9d06694f 100644 --- a/core/fxcrt/fx_extension.h +++ b/core/fxcrt/fx_extension.h @@ -50,8 +50,8 @@ inline bool FXSYS_iswalnum(wchar_t c) { return u_isalnum(c); } -inline bool FXSYS_iswASCIIspace(wchar_t c) { - return (c == 0x20) || (c == 0x0d) || (c == 0x0a) || (c == 0x09); +inline bool FXSYS_iswspace(wchar_t c) { + return u_isspace(c); } inline bool FXSYS_isHexDigit(const char c) { diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index f0767f3fc7..68e06a6c5d 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -97,7 +97,7 @@ FX_ARGB StringToFXARGB(const WideStringView& wsValue) { int cc = 0; const wchar_t* str = wsValue.unterminated_c_str(); int len = wsValue.GetLength(); - while (FXSYS_iswASCIIspace(str[cc]) && cc < len) + while (FXSYS_iswspace(str[cc]) && cc < len) cc++; if (cc >= len) @@ -112,7 +112,7 @@ FX_ARGB StringToFXARGB(const WideStringView& wsValue) { } if (cc < len && str[cc] == ',') { cc++; - while (FXSYS_iswASCIIspace(str[cc]) && cc < len) + while (FXSYS_iswspace(str[cc]) && cc < len) cc++; while (cc < len) { @@ -124,7 +124,7 @@ FX_ARGB StringToFXARGB(const WideStringView& wsValue) { } if (cc < len && str[cc] == ',') { cc++; - while (FXSYS_iswASCIIspace(str[cc]) && cc < len) + while (FXSYS_iswspace(str[cc]) && cc < len) cc++; while (cc < len) { diff --git a/xfa/fxfa/parser/cxfa_localevalue.cpp b/xfa/fxfa/parser/cxfa_localevalue.cpp index 57d6fbb4b6..8ef67e5183 100644 --- a/xfa/fxfa/parser/cxfa_localevalue.cpp +++ b/xfa/fxfa/parser/cxfa_localevalue.cpp @@ -202,7 +202,7 @@ double CXFA_LocaleValue::GetDoubleNum() const { bool bExpSign = false; const wchar_t* str = m_wsValue.c_str(); int len = m_wsValue.GetLength(); - while (FXSYS_iswASCIIspace(str[cc]) && cc < len) + while (FXSYS_iswspace(str[cc]) && cc < len) cc++; if (cc >= len) |