From b71cef856bf666824523bed445cffdbdd0871e0f Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 18 Apr 2010 23:19:54 +0000
Subject: [PATCH] fix linearization padding bug for second xref stream as well
 as first, which was previously fixed

git-svn-id: svn+q:///qpdf/trunk@957 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 ChangeLog                                  |  11 +++++++++++
 libqpdf/QPDFWriter.cc                      |  10 ++++------
 qpdf/qtest/qpdf/c-linearized.pdf           | Bin 10490 -> 10668 bytes
 qpdf/qtest/qpdf/lin-special.generate.exp   | Bin 2831 -> 2772 bytes
 qpdf/qtest/qpdf/object-stream.generate.exp | Bin 1560 -> 1476 bytes
 qpdf/qtest/qpdf/object-stream.preserve.exp | Bin 1560 -> 1476 bytes
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5397e595..66d9541e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-18  Jay Berkenbilt  <ejb@ql.org>
+
+	* 2.1.4: release
+
+	* libqpdf/QPDFWriter.cc (writeLinearized): the padding calculation
+	fix in 2.1.2 was applied in only one place but it was needed in
+	two places since there are actually two cross reference streams in
+	a linearized file.  The new padding calculation is now used for
+	both streams.  Hopefully this should put an end to linearization
+	padding problems.  (Fixes qpdf-Bugs-2979219.)
+
 2010-04-10  Jay Berkenbilt  <ejb@ql.org>
 
 	* qpdf/qpdf.cc (main): Since qpdf --check only checks syntax and
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index 786d4e8c..8468459c 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -2145,18 +2145,16 @@ QPDFWriter::writeLinearized()
 		writeXRefStream(second_half_xref,
 				second_half_end, second_xref_offset,
 				t_lin_second, 0, second_half_end,
-				second_trailer_size/*,
-				0, 0, 0, 0, (pass == 1)*/);
-///	    int endpos = this->pipeline->getCount();
+				second_trailer_size,
+				0, 0, 0, 0, (pass == 1));
+	    int endpos = this->pipeline->getCount();
 
 	    if (pass == 1)
 	    {
 		// Pad so we have enough room for the real xref
 		// stream.  See comments for previous xref stream on
 		// how we calculate the padding.
-
-///		writePad(calculateXrefStreamPadding(endpos - pos));
-		writePad(99);
+		writePad(calculateXrefStreamPadding(endpos - pos));
 		writeString("\n");
 		second_xref_end = this->pipeline->getCount();
 	    }
diff --git a/qpdf/qtest/qpdf/c-linearized.pdf b/qpdf/qtest/qpdf/c-linearized.pdf
index 42f3cf24a9bb7e53e757ac169e88090a0b2fb0ff..0768023ae3cf8a31ed9a0ad06dca80070dab5e14 100644
GIT binary patch
delta 24
gcmewrxF&dl9<!O5#YV#|8k3mPCoy?XeySk~0C%<s{Qv*}

delta 18
acmZ1z{3~#R9<zz1!A8R^8k47MiUI&e;|9+F

diff --git a/qpdf/qtest/qpdf/lin-special.generate.exp b/qpdf/qtest/qpdf/lin-special.generate.exp
index 2ffbe9130fd4bd3c125a2be746806a90cb97cf70..ad3df5ff664c18deb67eb81005acabae78965bdf 100644
GIT binary patch
delta 18
ZcmeAdyCOP4m)YFhXrn<t*W_PZq5wK-1{DAR

delta 21
ccmca2+AlUim)XMDaHBy#*CZzE$@{rP0Ze-ar2qf`

diff --git a/qpdf/qtest/qpdf/object-stream.generate.exp b/qpdf/qtest/qpdf/object-stream.generate.exp
index d5fa82aa6a96630fa3aa9252165a3baffc30a4e8..66618d2d6a7783a129402e15d9c90373ca02f2d6 100644
GIT binary patch
delta 18
ZcmbQibA)?>4zr25*+%^a*2&Clq5w5p1nK|)

delta 27
fcmX@YJ%eY04zsD5!AAWC)`<<OV8k_fJ*y}Hez*x1

diff --git a/qpdf/qtest/qpdf/object-stream.preserve.exp b/qpdf/qtest/qpdf/object-stream.preserve.exp
index d5fa82aa6a96630fa3aa9252165a3baffc30a4e8..66618d2d6a7783a129402e15d9c90373ca02f2d6 100644
GIT binary patch
delta 18
ZcmbQibA)?>4zr25*+%^a*2&Clq5w5p1nK|)

delta 27
fcmX@YJ%eY04zsD5!AAWC)`<<OV8k_fJ*y}Hez*x1