removed restriction to process PDF-1.x files only

(closes #291)

Author: mgieseki

src/PDFToSVG.cpp

@@ -35,6 +35,21 @@ PDFToSVG::PDFToSVG (const string &fname, SVGOutputBase &out) : ImageToSVG(fname,
 	}
 	if (!_useGS)
 		_pdfHandler.assignSVGTree(_svg);
+
+	ifstream ifs(filename());
+	if (ifs) {
+		string buf(5, 0);
+		ifs.read(&buf[0], 5);
+		if (buf == "%PDF-") {
+			int major=0, minor=0;
+			ifs >> major;
+			if (ifs.get() == '.')
+				ifs >> minor;
+			else
+				major = 0;  // missing dot => invalid PDF version
+			_pdfVersion = major*100 + minor;
+		}
+	}
 }
 
 
@@ -71,13 +86,7 @@ int PDFToSVG::totalPageCount () const {
 
 
 bool PDFToSVG::imageIsValid () const {
-	ifstream ifs(filename());
-	if (ifs) {
-		char buf[16];
-		ifs.getline(buf, 16);
-		return std::strncmp(buf, "%PDF-1.", 7) == 0;
-	}
-	return false;
+	return _pdfVersion > 0;
 }
 
 

src/PDFToSVG.hpp

@@ -44,6 +44,7 @@ class PDFToSVG : public ImageToSVG {
 		mutable int _totalPageCount = -1;
 		PDFHandler _pdfHandler;
 		bool _useGS = true;
+		int _pdfVersion = 0; // PDF version of file being processed (major*100 + minor)
 };
 
 #endif