remove use of float for version comparison

git-svn-id: svn+q:///qpdf/trunk@984 71b93d88-0707-0410-a8cf-f5a4172ac649

remove use of float for version comparison
git-svn-id: svn+q:///qpdf/trunk@984 71b93d88-0707-0410-a8cf-f5a4172ac649
Jay Berkenbilt
1 parent 01d6f04a
Showing 3 changed files with 67 additions and 14 deletions
TODO
include/qpdf/QPDFWriter.hh
libqpdf/QPDFWriter.cc
@@ -3,8 +3,6 @@ Next
  * Work in contrib/vc6.  See email from stronghorse@tom.com
- * Stop using float for version comparisons.
-
 2.2
 ===
@@ -207,7 +207,9 @@ class QPDFWriter
 	char const* user_password, char const* owner_password,
 	bool allow_accessibility, bool allow_extract,
 	qpdf_r3_print_e print, qpdf_r3_modify_e modify);
-    void disableIncompatbleEncryption(float v);
+    void disableIncompatibleEncryption(int major, int minor);
+    void parseVersion(std::string const& version, int& major, int& minor) const;
+    int compareVersions(int major1, int minor1, int major2, int minor2) const;
     void setEncryptionParameters(
 	char const* user_password, char const* owner_password,
 	int V, int R, int key_len, std::set<int>& bits_to_clear);
@@ -112,9 +112,13 @@ QPDFWriter::setMinimumPDFVersion(std::string const&amp; version)
     }
     else
     {
-	float v = atof(version.c_str());
-	float mv = atof(this->min_pdf_version.c_str());
-	if (v > mv)
+	int old_major = 0;
+	int old_minor = 0;
+	int min_major = 0;
+	int min_minor = 0;
+	parseVersion(version, old_major, old_minor);
+	parseVersion(this->min_pdf_version, min_major, min_minor);
+	if (compareVersions(old_minor, old_minor, min_minor, min_minor) > 0)
 	{
 	    QTC::TC("qpdf", "QPDFWriter increasing minimum version");
 	    set_version = true;
@@ -354,7 +358,7 @@ QPDFWriter::copyEncryptionParameters()
 }
 void
-QPDFWriter::disableIncompatbleEncryption(float v)
+QPDFWriter::disableIncompatibleEncryption(int major, int minor)
 {
     if (! this->encrypted)
     {
@@ -362,7 +366,7 @@ QPDFWriter::disableIncompatbleEncryption(float v)
     }
     bool disable = false;
-    if (v < 1.3)
+    if (compareVersions(major, minor, 1, 3) < 0)
     {
 	disable = true;
     }
@@ -370,21 +374,21 @@ QPDFWriter::disableIncompatbleEncryption(float v)
     {
 	int V = atoi(encryption_dictionary["/V"].c_str());
 	int R = atoi(encryption_dictionary["/R"].c_str());
-	if (v < 1.4)
+	if (compareVersions(major, minor, 1, 4) < 0)
 	{
 	    if ((V > 1) || (R > 2))
 	    {
 		disable = true;
 	    }
 	}
-	else if (v < 1.5)
+	else if (compareVersions(major, minor, 1, 5) < 0)
 	{
 	    if ((V > 2) || (R > 3))
 	    {
 		disable = true;
 	    }
 	}
-	else if (v < 1.6)
+	else if (compareVersions(major, minor, 1, 6) < 0)
 	{
 	    if (this->encrypt_use_aes)
 	    {
@@ -400,6 +404,53 @@ QPDFWriter::disableIncompatbleEncryption(float v)
 }
 void
+QPDFWriter::parseVersion(std::string const& version,
+			 int& major, int& minor) const
+{
+    major = atoi(version.c_str());
+    minor = 0;
+    size_t p = version.find('.');
+    if ((p != std::string::npos) && (version.length() > p))
+    {
+	minor = atoi(version.substr(p + 1).c_str());
+    }
+    std::string tmp = QUtil::int_to_string(major) + "." +
+	QUtil::int_to_string(minor);
+    if (tmp != version)
+    {
+	throw std::logic_error(
+	    "INTERNAL ERROR: QPDFWriter::parseVersion"
+	    " called with invalid version number " + version);
+    }
+}
+
+int
+QPDFWriter::compareVersions(int major1, int minor1,
+			    int major2, int minor2) const
+{
+    if (major1 < major2)
+    {
+	return -1;
+    }
+    else if (major1 > major2)
+    {
+	return 1;
+    }
+    else if (minor1 < minor2)
+    {
+	return -1;
+    }
+    else if (minor1 > minor2)
+    {
+	return 1;
+    }
+    else
+    {
+	return 0;
+    }
+}
+
+void
 QPDFWriter::setEncryptionParametersInternal(
     int V, int R, int key_len, long P,
     std::string const& O, std::string const& U,
@@ -1491,9 +1542,11 @@ QPDFWriter::write()
     if (! this->forced_pdf_version.empty())
     {
-	float v = atof(this->forced_pdf_version.c_str());
-	disableIncompatbleEncryption(v);
-	if (v < 1.5)
+	int major = 0;
+	int minor = 0;
+	parseVersion(this->forced_pdf_version, major, minor);
+	disableIncompatibleEncryption(major, minor);
+	if (compareVersions(major, minor, 1, 5) < 0)
 	{
 	    QTC::TC("qpdf", "QPDFWriter forcing object stream disable");
 	    this->object_stream_mode = qpdf_o_disable;