From 1c91537c9f9669246713a5be628493ae2fc4899a Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 3 Mar 2016 17:12:58 -0500 Subject: Combine StrToInt methods. This Cl combines the two StrToInt implementations. In doing so I had to add some more overrides to toDecimalDigit() and add a isDecimalDigit(). BUG=pdfium:423 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1757283002 . --- core/include/fxcrt/fx_ext.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'core/include/fxcrt') diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h index 3f4f668190..c8afb2b793 100644 --- a/core/include/fxcrt/fx_ext.h +++ b/core/include/fxcrt/fx_ext.h @@ -53,13 +53,21 @@ inline int FXSYS_toHexDigit(const FX_CHAR c) { return upchar > '9' ? upchar - 'A' + 10 : upchar - '0'; } +inline bool FXSYS_isDecimalDigit(const FX_CHAR c) { + return std::isdigit(c); +} + +inline bool FXSYS_isDecimalDigit(const FX_WCHAR c) { + return std::iswdigit(c); +} + inline int FXSYS_toDecimalDigit(const FX_CHAR c) { if (!std::isdigit(c)) return 0; return c - '0'; } -inline int FXSYS_toDecimalDigitWide(const FX_WCHAR c) { +inline int FXSYS_toDecimalDigit(const FX_WCHAR c) { if (!std::iswdigit(c)) return 0; return c - L'0'; -- cgit v1.2.3