Revert "Revert "Revert "Revert "Cleanup some numeric code.""""

core/src/fxcrt/fx_xml_parser.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // 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();
   }
 }
 FX_BOOL CXML_Parser::Init(uint8_t* pBuffer, size_t size) {
   m_pDataAcc = new CXML_DataBufAcc(pBuffer, size);
   return Init(TRUE);
 }
 FX_BOOL CXML_Parser::Init(IFX_FileRead* pFileRead) {
@@ skipping 200 matching lines @@
             iState = 4;
             break;
           }
           iState = 3;
         case 3:
           m_dwIndex++;
           if (ch == ';') {
             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++;
           if (ch == ';') {
             iState = 10;
             break;
           }
           uint8_t nHex =
               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 {
               code = (code << 4) + ch - 55;
             }
           }
           break;
       }
       if (iState == 10) {
         break;
@@ skipping 567 matching lines @@
   return (*m_pMap)[index];
 }
 void CXML_AttrMap::RemoveAll() {
   if (!m_pMap) {
     return;
   }
   m_pMap->RemoveAll();
   delete m_pMap;
   m_pMap = NULL;
 }