FOP-2965: Keep streams with DCT compression
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1881059 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java b/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java
index 52fb7c2..81de3ee 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java
@@ -42,6 +42,7 @@
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.common.PDStream;
+import org.apache.fop.pdf.DCTFilter;
import org.apache.fop.pdf.PDFArray;
import org.apache.fop.pdf.PDFDictionary;
import org.apache.fop.pdf.PDFDocument;
@@ -174,7 +175,12 @@
private Object readCOSStream(COSStream originalStream, Object keyBase) throws IOException {
InputStream in;
Set filter;
- if (adapter.pdfDoc.isEncryptionActive()
+ PDFStream stream = new PDFStream();
+ if (adapter.pdfDoc.isEncryptionActive() && originalStream.getItem(COSName.FILTER) == COSName.DCT_DECODE) {
+ stream.getFilterList().addFilter(new DCTFilter());
+ in = originalStream.getFilteredStream();
+ filter = Collections.EMPTY_SET;
+ } else if (adapter.pdfDoc.isEncryptionActive()
|| (originalStream.containsKey(COSName.DECODE_PARMS) && !originalStream.containsKey(COSName.FILTER))) {
in = originalStream.getUnfilteredStream();
filter = adapter.FILTER_FILTER;
@@ -183,7 +189,7 @@
in = originalStream.getFilteredStream();
filter = Collections.EMPTY_SET;
}
- PDFStream stream = new PDFStream();
+
OutputStream out = stream.getBufferOutputStream();
if (originalStream.getItem(COSName.SUBTYPE) == COSName.FORM && adapter.uniqueName != null) {
PDFWriter writer = new PDFWriter(adapter.uniqueName, adapter.currentMCID);
diff --git a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java b/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
index 84f36f4..7b7c6fe 100644
--- a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
@@ -75,6 +75,7 @@
import org.apache.fop.pdf.PDFArray;
import org.apache.fop.pdf.PDFDictionary;
import org.apache.fop.pdf.PDFDocument;
+import org.apache.fop.pdf.PDFEncryptionParams;
import org.apache.fop.pdf.PDFFilterList;
import org.apache.fop.pdf.PDFFormXObject;
import org.apache.fop.pdf.PDFGState;
@@ -497,6 +498,17 @@
}
}
+ private void loadPage(PDFDocument pdfdoc, String src) throws IOException {
+ PDFPage pdfpage = getPDFPage(pdfdoc);
+ pdfdoc.assignObjectNumber(pdfpage);
+ pdfpage.setDocument(pdfdoc);
+ PDFBoxAdapter adapter = new PDFBoxAdapter(pdfpage, new HashMap(), new HashMap<Integer, PDFArray>());
+ PDDocument doc = PDDocument.load(new File(src));
+ PDPage page = doc.getPage(0);
+ adapter.createStreamFromPDFBoxPage(doc, page, "key", new AffineTransform(), null, new Rectangle());
+ doc.close();
+ }
+
@Test
public void testPDFBoxImageHandler() throws Exception {
ImageInfo imgi = new ImageInfo("a", "b");
@@ -682,4 +694,14 @@
Assert.assertTrue(os.toString("UTF-8").contains("/F15106079 12 Tf"));
doc.close();
}
+
+ @Test
+ public void testDCTEncryption() throws IOException {
+ PDFDocument pdfdoc = new PDFDocument("");
+ pdfdoc.setEncryption(new PDFEncryptionParams());
+ loadPage(pdfdoc, IMAGE);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ pdfdoc.output(bos);
+ Assert.assertTrue(bos.toString("UTF-8").contains("/Filter /DCTDecode"));
+ }
}
