Revert "Revert "Cleanup some numeric code.""

core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp

Index: core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index 02f0933f360089f2677ae74ed1e2664466a0b51a..165ef5bad5b5c9c3b5cedf9f67954838dd440473 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -7,6 +7,7 @@
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_resource.h"
+#include "../../../include/fxcrt/fx_ext.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../fpdf_cmaps/cmap_int.h"
@@ -190,22 +191,15 @@ FX_DWORD CMap_GetCode(const CFX_ByteStringC& word) {
   if (word.GetAt(0) == '<') {

[Tom Sepez, 2015/10/29 19:28:31]

nit: can't these two branches of the if be merged?  Looks like only difference
is i = 0 vs. 1 ?

[dsinclair, 2015/11/03 15:59:02]

No, one is using std::isxdigit to convert hex characters and the other is
std::isdigit to convert non-hex digits.

     for (int i = 1; i < word.GetLength(); i++) {
       uint8_t digit = word.GetAt(i);
-      if (digit >= '0' && digit <= '9') {
-        digit = digit - '0';
-      } else if (digit >= 'a' && digit <= 'f') {
-        digit = digit - 'a' + 10;
-      } else if (digit >= 'A' && digit <= 'F') {
-        digit = digit - 'A' + 10;
-      } else {
+      if (!std::isxdigit(digit))
         return num;
-      }
-      num = num * 16 + digit;
+      num = num * 16 + HexCharToDigit(digit);
     }
   } else {
     for (int i = 0; i < word.GetLength(); i++) {
-      if (word.GetAt(i) < '0' || word.GetAt(i) > '9') {
+      if (!std::isdigit(word.GetAt(i)))
         return num;
-      }
+
       num = num * 10 + word.GetAt(i) - '0';
     }
   }
@@ -231,13 +225,7 @@ bool CMap_GetCodeRange(CMap_CodeRange& range,
   for (i = 0; i < range.m_CharSize; ++i) {
     uint8_t digit1 = first.GetAt(i * 2 + 1);
     uint8_t digit2 = first.GetAt(i * 2 + 2);
-    uint8_t byte = (digit1 >= '0' && digit1 <= '9')
-                       ? (digit1 - '0')
-                       : ((digit1 & 0xdf) - 'A' + 10);
-    byte = byte * 16 + ((digit2 >= '0' && digit2 <= '9')
-                            ? (digit2 - '0')
-                            : ((digit2 & 0xdf) - 'A' + 10));
-    range.m_Lower[i] = byte;
+    range.m_Lower[i] = HexCharToDigit(digit1) * 16 + HexCharToDigit(digit2);
   }
 
   FX_DWORD size = second.GetLength();
@@ -246,13 +234,7 @@ bool CMap_GetCodeRange(CMap_CodeRange& range,
         ((FX_DWORD)i * 2 + 1 < size) ? second.GetAt((FX_STRSIZE)i * 2 + 1) : 0;
     uint8_t digit2 =
         ((FX_DWORD)i * 2 + 2 < size) ? second.GetAt((FX_STRSIZE)i * 2 + 2) : 0;
-    uint8_t byte = (digit1 >= '0' && digit1 <= '9')
-                       ? (digit1 - '0')
-                       : ((digit1 & 0xdf) - 'A' + 10);
-    byte = byte * 16 + ((digit2 >= '0' && digit2 <= '9')
-                            ? (digit2 - '0')
-                            : ((digit2 & 0xdf) - 'A' + 10));
-    range.m_Upper[i] = byte;
+    range.m_Upper[i] = HexCharToDigit(digit1) * 16 + HexCharToDigit(digit2);
   }
   return true;
 }