Combine StrToInt methods.

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 "core/src/fxcrt/xml_int.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_xml.h"
@@ skipping 213 matching lines @@
             break;
           }
           iState = 3;
         case 3:
           m_dwIndex++;
           if (ch == ';') {
             iState = 10;
             break;
           }
           if (g_FXCRT_XML_IsDigital(ch))
-            code = code * 10 + FXSYS_toDecimalDigit(ch);
+            code = code * 10 + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(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) + FXSYS_toDecimalDigit(ch);
+              code =
+                  (code << 4) + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(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 526 matching lines @@
   m_pMap->push_back({space, name, value});
 }
 
 int CXML_AttrMap::GetSize() const {
   return m_pMap ? pdfium::CollectionSize<int>(*m_pMap) : 0;
 }
 
 CXML_AttrItem& CXML_AttrMap::GetAt(int index) const {
   return (*m_pMap)[index];
 }