Increase padding in linearized files

With QPDF allowing integers to contain 64-bit quantities, this change is necessary to be able to linearize files whose sizes might be larger than 10 digits.

Increase padding in linearized files
With QPDF allowing integers to contain 64-bit quantities, this change is necessary to be able to linearize files whose sizes might be larger than 10 digits.
Jay Berkenbilt
1 parent 8318d81a
Showing 8 changed files with 5 additions and 5 deletions
libqpdf/QPDFWriter.cc
qpdf/qtest/qpdf/c-linearized.pdf
qpdf/qtest/qpdf/lin-special.disable.exp
qpdf/qtest/qpdf/lin-special.generate.exp
qpdf/qtest/qpdf/lin-special.preserve.exp
qpdf/qtest/qpdf/object-stream.disable.exp
qpdf/qtest/qpdf/object-stream.generate.exp
qpdf/qtest/qpdf/object-stream.preserve.exp
@@ -882,8 +882,7 @@ QPDFWriter::writeTrailer(trailer_e which, int size, bool xref_stream,
 		    writeString(" /Prev ");
 		    qpdf_offset_t pos = this->pipeline->getCount();
 		    writeString(QUtil::int_to_string(prev));
-                    // XXX
-		    int nspaces = (int)(pos - this->pipeline->getCount() + 11);
+		    int nspaces = (int)(pos - this->pipeline->getCount() + 21);
 		    assert(nspaces >= 0);
 		    writePad(nspaces);
 		}
@@ -2122,9 +2121,10 @@ QPDFWriter::writeLinearized()
 	writeHeader();
  
 	// Part 2: linearization parameter dictionary.  Save enough
-	// space to write real dictionary.  150 characters is enough
+	// space to write real dictionary.  200 characters is enough
 	// space if all numerical values in the parameter dictionary
-	// are 10 digits long plus a few extra characters for safety.
+	// that contain offsets are 20 digits long plus a few extra
+	// characters for safety.
  
 	qpdf_offset_t pos = this->pipeline->getCount();
 	openObject(lindict_id);
@@ -2154,7 +2154,7 @@ QPDFWriter::writeLinearized()
 	}
 	writeString(" >>");
 	closeObject(lindict_id);
-	static int const pad = 150;
+	static int const pad = 200;
 	int spaces = (pos - this->pipeline->getCount() + pad);
 	assert(spaces >= 0);
 	writePad(spaces);