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/fxcrt/fx_xml_parser.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/fxcrt/fx_xml_parser.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_xml_parser.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp index dc59ded2b7..845fd84cfd 100644 --- a/core/src/fxcrt/fx_xml_parser.cpp +++ b/core/src/fxcrt/fx_xml_parser.cpp @@ -5,7 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_xml.h" +#include "../../include/fxcrt/fx_ext.h" #include "xml_int.h" + CXML_Parser::~CXML_Parser() { if (m_bOwnedStream) { m_pDataAcc->Release(); @@ -226,9 +228,8 @@ FX_DWORD CXML_Parser::GetCharRef() { iState = 10; break; } - if (g_FXCRT_XML_IsDigital(ch)) { - code = code * 10 + ch - '0'; - } + if (g_FXCRT_XML_IsDigital(ch)) + code = code * 10 + FXSYS_toDecimalDigit(ch); break; case 4: m_dwIndex++; @@ -240,7 +241,7 @@ FX_DWORD CXML_Parser::GetCharRef() { g_FXCRT_XML_ByteTypes[ch] & FXCRTM_XML_CHARTYPE_HexChar; if (nHex) { if (nHex == FXCRTM_XML_CHARTYPE_HexDigital) { - code = (code << 4) + ch - '0'; + code = (code << 4) + FXSYS_toDecimalDigit(ch); } else if (nHex == FXCRTM_XML_CHARTYPE_HexLowerLetter) { code = (code << 4) + ch - 87; } else { |