PDFBOX-6009: early deletion of MCR/OBJR dictionaries with no /Pg entry because source had the wrong /Pg entry

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1925813 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java

@@ -422,6 +422,7 @@ private COSBase createDictionaryClone(COSBase src, COSBase dstParent, COSDiction
             COSDictionary srcPageDict = srcDict.getCOSDictionary(COSName.PG);
             COSDictionary dstPageDict = null;
             COSBase kid = srcDict.getDictionaryObject(COSName.K);
+            COSName type = srcDict.getCOSName(COSName.TYPE);
             if (srcPageDict != null)
             {
                 dstPageDict = pageDictMap.get(srcPageDict);
@@ -435,8 +436,10 @@ private COSBase createDictionaryClone(COSBase src, COSBase dstParent, COSDiction
                 }
                 else
                 {
-                    // PDFBOX-6009: quit if MCIDs because these need a /Pg entry
-                    if (hasMCIDs(kid))
+                    // PDFBOX-6009: "wrong" /Pg entry
+                    // quit if MCIDs because these need a /Pg entry
+                    // or if MCR/OBJR dicts
+                    if (COSName.MCR.equals(type) || COSName.OBJR.equals(type) || hasMCIDs(kid))
                     {
                         return null;
                     }
@@ -445,7 +448,6 @@ private COSBase createDictionaryClone(COSBase src, COSBase dstParent, COSDiction
             }
 
             // special handling for MCR items ("marked-content reference dictionary")
-            COSName type = srcDict.getCOSName(COSName.TYPE);
             if (COSName.MCR.equals(type) && dstPageDict == null && 
                 dstParent instanceof COSDictionary && ((COSDictionary) dstParent).getCOSDictionary(COSName.PG) == null)
             {