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

This reverts commit e0e922db5fb77df9a5a9cc802096f484ed21da1c.

Broke Windows build.

FAILED: ninja -t msvc -e environment.x86 -- "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\core\src\fxcrt\fxcrt.fx_basic_gcc.obj.rsp /c ..\..\core\src\fxcrt\fx_basic_gcc.cpp /Foobj\core\src\fxcrt\fxcrt.fx_basic_gcc.obj /Fdobj\fxcrt.cc.pdb
e:\b\build\slave\windows\build\pdfium\core\src\fxcrt\fx_basic_gcc.cpp(28) : error C2220: warning treated as error - no 'object' file generated
        e:\b\build\slave\windows\build\pdfium\core\src\fxcrt\fx_basic_gcc.cpp(75) : see reference to function template instantiation 'T FXSYS_StrToInt<int32_t,const FX_WCHAR*>(STR_T)' being compiled
        with
        [
            T=int32_t
,            STR_T=const FX_WCHAR *
        ]
e:\b\build\slave\windows\build\pdfium\core\src\fxcrt\fx_basic_gcc.cpp(28) : warning C4244: 'argument' : conversion from 'const FX_WCHAR' to 'char', possible loss of data
FAILED: ninja -t msvc -e environment.x86 -- "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\core\src\fpdftext\fpdftext.fpdf_text.obj.rsp /c ..\..\core\src\fpdftext\fpdf_text.cpp /Foobj\core\src\fpdftext\fpdftext.fpdf_text.obj /Fdobj\fpdftext.cc.pdb
e:\b\build\slave\windows\build\pdfium\core\src\fpdftext\fpdf_text.cpp(439) : error C2039: 'isdigit' : is not a member of 'std'
FAILED: ninja -t msvc -e environment.x86 -- "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\core\src\fxcrt\fxcrt.fx_basic_wstring.obj.rsp /c ..\..\core\src\fxcrt\fx_basic_wstring.cpp /Foobj\core\src\fxcrt\fxcrt.fx_basic_wstring.obj /Fdobj\fxcrt.cc.pdb
e:\b\build\slave\windows\build\pdfium\core\src\fxcrt\fx_basic_wstring.cpp(973) : error C2220: warning treated as error - no 'object' file generated
e:\b\build\slave\windows\build\pdfium\core\src\fxcrt\fx_basic_wstring.cpp(973) : warning C4244: 'argument' : conversion from 'const FX_WCHAR' to 'char', possible loss of data
e:\b\build\slave\windows\build\pdfium\core\src\fxcrt\fx_basic_wstring.cpp(981) : warning C4244: 'argument' : conversion from 'const FX_WCHAR' to 'char', possible loss of data
FAILED: ninja -t msvc -e environment.x86 -- "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\core\src\fpdftext\fpdftext.fpdf_text_int.obj.rsp /c ..\..\core\src\fpdftext\fpdf_text_int.cpp /Foobj\core\src\fpdftext\fpdftext.fpdf_text_int.obj /Fdobj\fpdftext.cc.pdb
e:\b\build\slave\windows\build\pdfium\core\src\fpdftext\fpdf_text_int.cpp(2436) : error C2039: 'isdigit' : is not a member of 'std'
e:\b\build\slave\windows\build\pdfium\core\src\fpdftext\fpdf_text_int.cpp(2440) : error C2039: 'isdigit' : is not a member of 'std'
ninja: build stopped: subcommand failed.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1431683008 .

1 files changed, 38 insertions, 13 deletions

diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index 2d5e9780ad..0529d3d35b 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -8,7 +8,6 @@
 #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"
@@ -514,19 +513,32 @@ FX_DWORD CPDF_ToUnicodeMap::ReverseLookup(FX_WCHAR unicode) {
 FX_DWORD CPDF_ToUnicodeMap::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 && std::isxdigit(buf[i]); ++i)
-      result = result * 16 + FXSYS_toHexDigit(buf[i]);
+    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;
+    }
     return result;
   }
-
-  for (int i = 0; i < len && std::isdigit(buf[i]); ++i)
-    result = result * 10 + FXSYS_toDecimalDigit(buf[i]);
-
+  for (int i = 0; i < len; i++) {
+    if (buf[i] < '0' || buf[i] > '9') {
+      break;
+    }
+    result = result * 10 + buf[i] - '0';
+  }
   return result;
 }
 static CFX_WideString StringDataAdd(CFX_WideString str) {
@@ -553,15 +565,26 @@ CFX_WideString CPDF_ToUnicodeMap::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 && std::isxdigit(buf[i]); ++i) {
-      ch = ch * 16 + FXSYS_toHexDigit(buf[i]);
+    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;
+      }
+      ch = ch * 16 + digit;
+
       byte_pos++;
       if (byte_pos == 4) {
         result += ch;
@@ -571,6 +594,8 @@ CFX_WideString CPDF_ToUnicodeMap::StringToWideString(
     }
     return result;
   }
+  if (buf[0] == '(') {
+  }
   return result;
 }
 void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) {