Combine StrToInt methods.

core/src/fpdfapi/fpdf_font/fpdf_font_cid.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/fpdfapi/fpdf_font/font_int.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 702 matching lines @@
 // Static.
 FX_DWORD CPDF_CMapParser::CMap_GetCode(const CFX_ByteStringC& word) {
   int num = 0;
   if (word.GetAt(0) == '<') {
     for (int i = 1; i < word.GetLength() && std::isxdigit(word.GetAt(i)); ++i)
       num = num * 16 + FXSYS_toHexDigit(word.GetAt(i));
     return num;
   }
 
   for (int i = 0; i < word.GetLength() && std::isdigit(word.GetAt(i)); ++i)
-    num = num * 10 + FXSYS_toDecimalDigit(word.GetAt(i));
+    num = num * 10 + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(word.GetAt(i)));
   return num;
 }
 
 // Static.
 bool CPDF_CMapParser::CMap_GetCodeRange(CMap_CodeRange& range,
                                         const CFX_ByteStringC& first,
                                         const CFX_ByteStringC& second) {
   if (first.GetLength() == 0 || first.GetAt(0) != '<')
     return false;
 
@@ skipping 996 matching lines @@
 
 const uint8_t* CPDF_CIDFont::GetCIDTransform(FX_WORD CID) const {
   if (m_Charset != CIDSET_JAPAN1 || m_pFontFile)
     return nullptr;
 
   const struct CIDTransform* found = (const struct CIDTransform*)FXSYS_bsearch(
       &CID, g_Japan1_VertCIDs, FX_ArraySize(g_Japan1_VertCIDs),
       sizeof(g_Japan1_VertCIDs[0]), CompareCIDTransform);
   return found ? &found->a : nullptr;
 }