Import of Xpdf 1.01 in preparation of 2.0x imports

diff --git a/pdf/xpdf/FontFile.cc b/pdf/xpdf/FontFile.cc
index 56807a4b9157aee6d7e1f90a08ff51236cf11d6d..ae585470d696089d2942cb06637a1d65a8ad9787 100644 (file)
--- a/pdf/xpdf/FontFile.cc
+++ b/pdf/xpdf/FontFile.cc
@@ -11,7 +11,6 @@
 #endif
 
 #include <aconf.h>
-#include <locale.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -2131,11 +2130,7 @@ double Type1CFontFile::getNum(Guchar **ptr, GBool *isFP) {
       }
     } while (i < 64);
     buf[i] = '\0';
-    {
-      char *theLocale = setlocale(LC_NUMERIC, "C");
-      x = atof(buf);
-      setlocale(LC_NUMERIC, theLocale);
-    }
+    x = atof(buf);
     *isFP = gTrue;
   } else if (b0 == 31) {
     x = 0;

diff --git a/pdf/xpdf/Function.cc b/pdf/xpdf/Function.cc
index 6d70858a17fd747ceda1ccfd5cc5c05bba72871f..64ea60c1902e6bbbcc8b7e3e3b0ef21ceb993fa6 100644 (file)
--- a/pdf/xpdf/Function.cc
+++ b/pdf/xpdf/Function.cc
@@ -11,7 +11,6 @@
 #endif
 
 #include <aconf.h>
-#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -1072,11 +1071,7 @@ GBool PostScriptFunction::parseCode(Stream *str, int *codePtr) {
       resizeCode(*codePtr);
       if (isReal) {
        code[*codePtr].type = psReal;
-        {
-          char *theLocale = setlocale(LC_NUMERIC, "C");
-          code[*codePtr].real = atof(tok->getCString());
-          setlocale(LC_NUMERIC, theLocale);
-        }
+       code[*codePtr].real = atof(tok->getCString());
       } else {
        code[*codePtr].type = psInt;
        code[*codePtr].intg = atoi(tok->getCString());