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 2019/01/22 16:49:13 UTC

svn commit: r1851836 - in /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf: PDFCloneUtility.java PDFMergerUtility.java

Author: tilman
Date: Tue Jan 22 16:49:13 2019
New Revision: 1851836

URL: http://svn.apache.org/viewvc?rev=1851836&view=rev
Log:
PDFBOX-3973: cloneMerge OCGs; dereference COSArray too when cloneMerging

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java?rev=1851836&r1=1851835&r2=1851836&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java Tue Jan 22 16:49:13 2019
@@ -187,7 +187,7 @@ public class PDFCloneUtility
               {
                   cloneMerge(((COSObject) base).getObject(),((COSObject) target).getObject() );
               }
-              else if(target instanceof COSDictionary)
+              else if (target instanceof COSDictionary || target instanceof COSArray)
               {
                   cloneMerge(((COSObject) base).getObject(), target);
               }

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1851836&r1=1851835&r2=1851836&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Tue Jan 22 16:49:13 2019
@@ -689,6 +689,10 @@ public class PDFMergerUtility
         {
             destCatalog.getCOSObject().setItem(COSName.OCPROPERTIES, cloner.cloneForNewDocument(srcOCP));
         }
+        else if (destOCP != null && srcOCP != null)
+        {
+            cloner.cloneMerge(srcOCP, destOCP);
+        }
         
         mergeOutputIntents(cloner, srcCatalog, destCatalog);