Move poppler core away from using a double as PDF file version

Frontends are yet to come

6 files changed, 16 insertions, 13 deletions

diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index dfdfb803..6b46fc03 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -648,3 +648,3 @@ poppler_document_get_property (GObject    *object,
       g_ascii_formatd (str + 4, 15 + 1 - 4,
-		       "%.2g", document->doc->getPDFVersion ());
+		       "%.2g", document->doc->getPDFMajorVersion () + document->doc->getPDFMinorVersion() / 10.0);
       g_value_take_string (value, str);
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index 463488fa..435ad100 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -306,3 +306,4 @@ void PDFDoc::checkHeader() {
 
-  pdfVersion = 0;
+  pdfMajorVersion = 0;
+  pdfMinorVersion = 0;
   for (i = 0; i < headerSearchSize; ++i) {
@@ -325,3 +326,3 @@ void PDFDoc::checkHeader() {
   }
-  pdfVersion = gatof(p);
+  sscanf(p, "%d.%d", &pdfMajorVersion, &pdfMinorVersion);
   // We don't do the version check. Don't add it back in.
@@ -580,3 +581,3 @@ void PDFDoc::saveCompleteRewrite (OutStream* outStr)
 {
-  outStr->printf("%%PDF-%.1f\r\n",pdfVersion);
+  outStr->printf("%%PDF-%d.%d\r\n",pdfMajorVersion,pdfMinorVersion);
   XRef *uxref = new XRef();
diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index 94229b79..75273160 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -16,3 +16,3 @@
 // Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
@@ -201,3 +201,4 @@ public:
   // Return the PDF version specified by the file.
-  double getPDFVersion() { return pdfVersion; }
+  int getPDFMajorVersion() { return pdfMajorVersion; }
+  int getPDFMinorVersion() { return pdfMinorVersion; }
 
@@ -236,3 +237,4 @@ private:
   void *guiData;
-  double pdfVersion;
+  int pdfMajorVersion;
+  int pdfMinorVersion;
   XRef *xref;
diff --git a/qt/poppler-document.cc b/qt/poppler-document.cc
index 4c47e625..fe746760 100644
--- a/qt/poppler-document.cc
+++ b/qt/poppler-document.cc
@@ -2,3 +2,3 @@
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005-2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005-2009, Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2006, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
@@ -272,3 +272,3 @@ double Document::getPDFVersion() const
 {
-  return data->doc.getPDFVersion();
+  return data->doc.getPDFMajorVersion () + data->doc.getPDFMinorVersion() / 10.0;
 }
diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index 4eb1abaf..3e4b086c 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -3,3 +3,3 @@
  * Copyright (C) 2005, 2008, Brad Hards <bradh@frogmouth.net>
- * Copyright (C) 2005-2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005-2009, Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2006-2009, Pino Toscano <pino@kde.org>
@@ -381,3 +381,3 @@ namespace Poppler {
     {
-	return m_doc->doc->getPDFVersion();
+	return m_doc->doc->getPDFMajorVersion () + m_doc->doc->getPDFMinorVersion() / 10.0;
     }
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 9063f87d..bfbe0b3d 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -16,3 +16,3 @@
 // Copyright (C) 2006 Dom Lachowicz <cinamod@hotmail.com>
-// Copyright (C) 2007-2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2009 Albert Astals Cid <aacid@kde.org>
 //
@@ -305,3 +305,3 @@ int main(int argc, char *argv[]) {
   // print PDF version
-  printf("PDF version:    %.1f\n", doc->getPDFVersion());
+  printf("PDF version:    %d.%d\n", doc->getPDFMajorVersion(), doc->getPDFMinorVersion());