Revert "Revert "Cleanup some numeric code.""

core/src/fpdfapi/fpdf_font/fpdf_font.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/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../../include/fpdfapi/fpdf_resource.h"
+#include "../../../include/fxcrt/fx_ext.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "../fpdf_page/pageint.h"
 #include "font_int.h"
 
 FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) {
   for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) {
     if (FXFT_Get_Charmap_PlatformID(FXFT_Get_Face_Charmaps(face)[i]) ==
             platform_id &&
         FXFT_Get_Charmap_EncodingID(FXFT_Get_Face_Charmaps(face)[i]) ==
             encoding_id) {
@@ skipping 483 matching lines @@
 FX_DWORD CPDF_ToUnicodeMap::ReverseLookup(FX_WCHAR unicode) {
   for (const auto& pair : m_Map) {
     if (pair.second == unicode)
       return pair.first;
   }
   return 0;
 }
 static FX_DWORD _StringToCode(const CFX_ByteStringC& str) {
   const FX_CHAR* buf = str.GetCStr();
   int len = str.GetLength();
-  if (len == 0) {
+  if (len == 0)
     return 0;
-  }
+
   int result = 0;
   if (buf[0] == '<') {
-    for (int i = 1; i < len; i++) {
-      int digit;
-      if (buf[i] >= '0' && buf[i] <= '9') {
-        digit = buf[i] - '0';
-      } else if (buf[i] >= 'a' && buf[i] <= 'f') {
-        digit = buf[i] - 'a' + 10;
-      } else if (buf[i] >= 'A' && buf[i] <= 'F') {
-        digit = buf[i] - 'A' + 10;
-      } else {
-        break;
-      }
-      result = result * 16 + digit;
-    }
+    for (int i = 1; i < len && !std::isxdigit(buf[i]); ++i)

[Tom Sepez, 2015/10/29 20:44:26]

I don't think you want the ! here.

[dsinclair, 2015/11/02 15:43:37]

Done.

+      result = result * 16 + FXSYS_toHexDigit(buf[i]);
     return result;
   }
+
   for (int i = 0; i < len; i++) {

[Tom Sepez, 2015/10/29 20:44:26]

Lets make the same change here.

[dsinclair, 2015/11/02 15:43:37]

Done.

-    if (buf[i] < '0' || buf[i] > '9') {
+    if (!std::isdigit(buf[i]))
       break;
-    }
-    result = result * 10 + buf[i] - '0';
+    result = result * 10 + FXSYS_toDecimalDigit(buf[i]);
   }
+
   return result;
 }
 static CFX_WideString _StringDataAdd(CFX_WideString str) {
   CFX_WideString ret;
   int len = str.GetLength();
   FX_WCHAR value = 1;
   for (int i = len - 1; i >= 0; --i) {
     FX_WCHAR ch = str[i] + value;
     if (ch < str[i]) {
       ret.Insert(0, 0);
     } else {
       ret.Insert(0, ch);
       value = 0;
     }
   }
   if (value) {
     ret.Insert(0, value);
   }
   return ret;
 }
 static CFX_WideString _StringToWideString(const CFX_ByteStringC& str) {
   const FX_CHAR* buf = str.GetCStr();
   int len = str.GetLength();
-  if (len == 0) {
+  if (len == 0)
     return CFX_WideString();
-  }
+
   CFX_WideString result;
   if (buf[0] == '<') {
     int byte_pos = 0;
     FX_WCHAR ch = 0;
     for (int i = 1; i < len; i++) {
-      int digit;
-      if (buf[i] >= '0' && buf[i] <= '9') {
-        digit = buf[i] - '0';
-      } else if (buf[i] >= 'a' && buf[i] <= 'f') {
-        digit = buf[i] - 'a' + 10;
-      } else if (buf[i] >= 'A' && buf[i] <= 'F') {
-        digit = buf[i] - 'A' + 10;
-      } else {
+      if (!std::isxdigit(buf[i]))
         break;
-      }
-      ch = ch * 16 + digit;
+
+      ch = ch * 16 + FXSYS_toHexDigit(buf[i]);
       byte_pos++;
       if (byte_pos == 4) {
         result += ch;
         byte_pos = 0;
         ch = 0;
       }
     }
     return result;
   }
-  if (buf[0] == '(') {
-  }
   return result;
 }
 void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) {
   CIDSet cid_set = CIDSET_UNKNOWN;
   CPDF_StreamAcc stream;
   stream.LoadAllData(pStream, FALSE);
   CPDF_SimpleParser parser(stream.GetData(), stream.GetSize());
   while (1) {
     CFX_ByteStringC word = parser.GetWord();
     if (word.IsEmpty()) {
@@ skipping 1178 matching lines @@
 CPDF_Type3Char::CPDF_Type3Char() {
   m_pForm = NULL;
   m_pBitmap = NULL;
   m_bPageRequired = FALSE;
   m_bColored = FALSE;
 }
 CPDF_Type3Char::~CPDF_Type3Char() {
   delete m_pForm;
   delete m_pBitmap;
 }