pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From til...@apache.org
Subject svn commit: r1592122 - in /pdfbox/branches/1.8/pdfbox/src: main/java/org/apache/pdfbox/util/PDFCloneUtility.java test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
Date Fri, 02 May 2014 23:42:29 GMT
Author: tilman
Date: Fri May  2 23:42:29 2014
New Revision: 1592122

URL: http://svn.apache.org/r1592122
Log:
PDFBOX-2052: PDFCloneUtility now handles COSStreamArray and a test as suggested by Cornelis
Hoeflake

Added:
    pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
  (with props)
Modified:
    pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java

Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java?rev=1592122&r1=1592121&r2=1592122&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java Fri
May  2 23:42:29 2014
@@ -29,6 +29,7 @@ import org.apache.pdfbox.cos.COSObject;
 import org.apache.pdfbox.cos.COSStream;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.COSObjectable;
+import org.apache.pdfbox.pdmodel.common.COSStreamArray;
 import org.apache.pdfbox.pdmodel.common.PDStream;
 
 /**
@@ -110,6 +111,25 @@ public class PDFCloneUtility
               retval = newArray;
               clonedVersion.put( base, retval );
           }
+          else if (base instanceof COSStreamArray) // PDFBOX-2052
+          {
+              COSStreamArray originalStream = (COSStreamArray) base;
+
+              if (originalStream.size() > 0)
+              {
+                  throw new IllegalStateException("Cannot close stream array with items next
to the streams.");
+              }
+
+              COSArray array = new COSArray();
+              for (int i = 0; i < originalStream.getStreamCount(); i++)
+              {
+                  COSBase base2 = originalStream.get(i);
+                  COSBase cloneForNewDocument = cloneForNewDocument(base2);
+                  array.add(cloneForNewDocument);
+              }
+              retval = new COSStreamArray(array);
+              clonedVersion.put(base, retval);
+          }
           else if( base instanceof COSStream )
           {
               COSStream originalStream = (COSStream)base;

Added: pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java?rev=1592122&view=auto
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
(added)
+++ pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
Fri May  2 23:42:29 2014
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pdfbox.util;
+
+import java.awt.Color;
+import java.io.File;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+
+/**
+ * Test suite for PDFCloneUtility, see PDFBOX-2052.
+ *
+ * @author <a href="mailto:c.hoeflake@gmail.com">Cornelis Hoeflake</a>
+ * @author Tilman Hausherr
+ */
+public class PDFCloneUtilityTest extends TestCase
+{
+    /**
+     * original (minimal) test from PDFBOX-2052.
+     * 
+     * @throws IOException 
+     */
+    public void testClonePDFWithCosArrayStream() throws IOException
+    {
+        PDDocument srcDoc = new PDDocument();
+        PDDocument dstDoc = new PDDocument();
+        PDPage pdPage = new PDPage();
+        srcDoc.addPage(pdPage);
+        new PDPageContentStream(srcDoc, pdPage, true, true).close();
+        new PDPageContentStream(srcDoc, pdPage, true, true).close();
+        new PDFCloneUtility(dstDoc).cloneForNewDocument(pdPage.getCOSDictionary());
+        srcDoc.close();
+        dstDoc.close();
+    }
+
+    /**
+     * broader test that saves to a real PDF document.
+     * 
+     * @throws IOException 
+     */
+    public void testClonePDFWithCosArrayStream2() throws IOException, COSVisitorException
+    {
+        final String TESTDIR = "target/test-output/clone/";
+        final String CLONESRC = "clone-src.pdf";
+        final String CLONEDST = "clone-dst.pdf";
+
+        new File(TESTDIR).mkdirs();
+
+        PDDocument srcDoc = new PDDocument();
+        PDPage pdPage = new PDPage();
+        srcDoc.addPage(pdPage);
+        PDPageContentStream pdPageContentStream1 = new PDPageContentStream(srcDoc, pdPage,
true, false);
+        pdPageContentStream1.setNonStrokingColor(Color.black);
+        pdPageContentStream1.fillRect(100, 600, 300, 100);
+        pdPageContentStream1.close();
+        PDPageContentStream pdPageContentStream2 = new PDPageContentStream(srcDoc, pdPage,
true, false);
+        pdPageContentStream2.setNonStrokingColor(Color.red);
+        pdPageContentStream2.fillRect(100, 500, 300, 100);
+        pdPageContentStream2.close();
+        PDPageContentStream pdPageContentStream3 = new PDPageContentStream(srcDoc, pdPage,
true, false);
+        pdPageContentStream3.setNonStrokingColor(Color.yellow);
+        pdPageContentStream3.fillRect(100, 400, 300, 100);
+        pdPageContentStream3.close();
+
+        srcDoc.save(TESTDIR + CLONESRC);
+        PDFMergerUtility merger = new PDFMergerUtility();
+        PDDocument dstDoc = new PDDocument();
+
+        // this calls PDFCloneUtility.cloneForNewDocument(), 
+        // which would fail before the fix in PDFBOX-2052
+        merger.appendDocument(dstDoc, srcDoc);
+
+        // save and reload PDF, so that once can see that the files are legit
+        dstDoc.save(TESTDIR + CLONEDST);
+        PDDocument.load(TESTDIR + CLONESRC).close();
+        PDDocument.loadNonSeq(new File(TESTDIR + CLONESRC), null).close();
+        PDDocument.load(TESTDIR + CLONEDST).close();
+        PDDocument.loadNonSeq(new File(TESTDIR + CLONEDST), null).close();
+    }
+}

Propchange: pdfbox/branches/1.8/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message