You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/09/23 20:39:56 UTC
svn commit: r1704912 - in /pdfbox/trunk/pdfbox/src/test:
java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
resources/input/merge/jpegrgb.pdf resources/input/merge/multitiff.pdf
Author: tilman
Date: Wed Sep 23 18:39:54 2015
New Revision: 1704912
URL: http://svn.apache.org/viewvc?rev=1704912&view=rev
Log:
PDFBOX-2893: add a test merging PDFs with CCITT and JPEG encoded images
Added:
pdfbox/trunk/pdfbox/src/test/resources/input/merge/jpegrgb.pdf (with props)
pdfbox/trunk/pdfbox/src/test/resources/input/merge/multitiff.pdf (with props)
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1704912&r1=1704911&r2=1704912&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java Wed Sep 23 18:39:54 2015
@@ -17,6 +17,7 @@ package org.apache.pdfbox.multipdf;
import java.awt.image.BufferedImage;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import junit.framework.TestCase;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -45,6 +46,8 @@ public class PDFMergerUtilityTest extend
throw new IOException("could not create output directory");
}
}
+
+
/**
* Tests whether the merge of two PDF files with identically named but
@@ -70,6 +73,27 @@ public class PDFMergerUtilityTest extend
true);
}
+ /**
+ * Tests whether the merge of two PDF files with JPEG and CCITT works. A few revisions before
+ * 1704911 this test failed because the clone utility attempted to decode and re-encode the
+ * streams, see PDFBOX-2893 on 23.9.2015.
+ *
+ * @throws IOException if something goes wrong.
+ */
+ public void testJpegCcitt() throws IOException
+ {
+ checkMergeIdentical("jpegrgb.pdf",
+ "multitiff.pdf",
+ "JpegMultiMergeTestResult.pdf",
+ false);
+
+ // once again, with scratch file
+ checkMergeIdentical("jpegrgb.pdf",
+ "multitiff.pdf",
+ "JpegMultiMergeTestResult.pdf",
+ true);
+ }
+
// see PDFBOX-2893
public void testPDFMergerUtility2() throws IOException
{
Added: pdfbox/trunk/pdfbox/src/test/resources/input/merge/jpegrgb.pdf
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/resources/input/merge/jpegrgb.pdf?rev=1704912&view=auto
==============================================================================
Binary file - no diff available.
Propchange: pdfbox/trunk/pdfbox/src/test/resources/input/merge/jpegrgb.pdf
------------------------------------------------------------------------------
svn:mime-type = application/pdf
Added: pdfbox/trunk/pdfbox/src/test/resources/input/merge/multitiff.pdf
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/resources/input/merge/multitiff.pdf?rev=1704912&view=auto
==============================================================================
Binary file - no diff available.
Propchange: pdfbox/trunk/pdfbox/src/test/resources/input/merge/multitiff.pdf
------------------------------------------------------------------------------
svn:mime-type = application/pdf