From 939b9d12f2919ceea85575e6b7e1d67874da91a8 Mon Sep 17 00:00:00 2001
From: Martin Kretzschmar <mkretzschmar@src.gnome.org>
Date: Sun, 23 Feb 2003 13:35:35 +0000
Subject: new widget: table with labels displaying properties of PDFs

* xpdf/pdf-properties-display.c, xpdf/pdf-properties-display.h,
xpdf/gpdf-properties-dialog.glade:
new widget: table with labels displaying properties of PDFs

* xpdf/gpdf-control.cc (has_unicode_marker)
(utf16_big_endian_to_utf8, info_dict_get_string)
(info_dict_get_date, gpdf_control_process_string_property)
(gpdf_control_process_date_property)
(gpdf_control_process_properties)
(gpdf_control_properties_dialog_response_cb)
(verb_FileProperties_cb): new: a PDF properties command

* xpdf/Makefile.am: build pdf-properties-display.[ch], install
glade file

* xpdf/.cvsignore: ignore gpdf-properties-dialog.gladep

* xpdf/gpdf-persist-stream.h, xpdf/gpdf-persist-stream.cc
(gpdf_persist_stream_get_length): new function

* xpdf/gpdf-control-ui.xml: add FileProperties command and menu
item inside a "File Items Placeholder"

* shell/gpdf-window-ui.xml: add "File Items Placeholder"

* configure.in: check for libglade-2.0

* Makefile.am (EXTRA_DIST): don't dist gpdf.mime

* xpdf/PDFDoc.cc, xpdf/Function.cc, xpdf/FontFile.cc,
goo/parseargs.c: call atof only in the "C" locale
---
(limited to 'pdf/xpdf/PDFDoc.cc')

diff --git a/pdf/xpdf/PDFDoc.cc b/pdf/xpdf/PDFDoc.cc
index 683e4d2..f3b7f79 100644
--- a/pdf/xpdf/PDFDoc.cc
+++ b/pdf/xpdf/PDFDoc.cc
@@ -11,6 +11,7 @@
 #endif
 
 #include <aconf.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -168,7 +169,11 @@ void PDFDoc::checkHeader() {
   }
   str->moveStart(i);
   p = strtok(&hdrBuf[i+5], " \t\n\r");
-  pdfVersion = atof(p);
+  {
+    char *theLocale = setlocale(LC_NUMERIC, "C");
+    pdfVersion = atof(p);
+    setlocale(LC_NUMERIC, theLocale);
+  }
   if (!(hdrBuf[i+5] >= '0' && hdrBuf[i+5] <= '9') ||
       pdfVersion > supportedPDFVersionNum + 0.0001) {
     error(-1, "PDF version %s -- xpdf supports version %s"
--
cgit v0.9.1