Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kretzschmar <mkretzschmar@src.gnome.org>2003-03-31 15:36:22 (GMT)
committer Martin Kretzschmar <mkretzschmar@src.gnome.org>2003-03-31 15:36:22 (GMT)
commit5f7eee136b5330a15069179cbd97f168287a9ef6 (patch)
tree63f86cbfcd6b29ce39e394b2210f34c530cfbfba
parent829ff1baafce438b4c122013ad3d6846a8a952e5 (diff)
Import of Xpdf 1.01 in preparation of 2.0x imports
-rw-r--r--pdf/xpdf/FontFile.cc7
-rw-r--r--pdf/xpdf/Function.cc7
2 files changed, 2 insertions, 12 deletions
diff --git a/pdf/xpdf/FontFile.cc b/pdf/xpdf/FontFile.cc
index 56807a4..ae58547 100644
--- 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 6d70858..64ea60c 100644
--- 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());