Fix possible issues with PdfPage's inherited properties

DEVSIX-1704

Author: pavel-alay

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfPage.java

@@ -101,8 +101,8 @@ protected PdfPage(PdfDictionary pdfObject) {
     }
 
     protected PdfPage(PdfDocument pdfDocument, PageSize pageSize) {
-        this((PdfDictionary)new PdfDictionary().makeIndirect(pdfDocument));
-        PdfStream contentStream = (PdfStream)new PdfStream().makeIndirect(pdfDocument);
+        this((PdfDictionary) new PdfDictionary().makeIndirect(pdfDocument));
+        PdfStream contentStream = (PdfStream) new PdfStream().makeIndirect(pdfDocument);
         getPdfObject().put(PdfName.Contents, contentStream);
         getPdfObject().put(PdfName.Type, PdfName.Page);
         getPdfObject().put(PdfName.MediaBox, new PdfArray(pageSize));
@@ -150,8 +150,7 @@ public int getRotation() {
         PdfNumber rotate = getPdfObject().getAsNumber(PdfName.Rotate);
         int rotateValue = 0;
         if (rotate == null) {
-            initParentPages();
-            rotate = (PdfNumber) getParentValue(this.parentPages, PdfName.Rotate);
+            rotate = (PdfNumber) getInheritedValue(PdfName.Rotate, PdfObject.NUMBER);
         }
         if (rotate != null) {
             rotateValue = rotate.intValue();
@@ -274,8 +273,7 @@ public PdfResources getResources() {
             boolean readOnly = false;
             PdfDictionary resources = getPdfObject().getAsDictionary(PdfName.Resources);
             if (resources == null) {
-                initParentPages();
-                resources = (PdfDictionary) getParentValue(this.parentPages, PdfName.Resources);
+                resources = (PdfDictionary) getInheritedValue(PdfName.Resources, PdfObject.DICTIONARY);
                 if (resources != null) {
                     readOnly = true;
                 }
@@ -515,10 +513,9 @@ public void flush(boolean flushResourcesContentStreams) {
      * @throws PdfException in case of any error while reading MediaBox object.
      */
     public Rectangle getMediaBox() {
-        initParentPages();
         PdfArray mediaBox = getPdfObject().getAsArray(PdfName.MediaBox);
         if (mediaBox == null) {
-            mediaBox = (PdfArray) getParentValue(parentPages, PdfName.MediaBox);
+            mediaBox = (PdfArray) getInheritedValue(PdfName.MediaBox, PdfObject.ARRAY);
         }
         if (mediaBox == null) {
             throw new PdfException(PdfException.CannotRetrieveMediaBoxAttribute);
@@ -560,10 +557,9 @@ public PdfPage setMediaBox(Rectangle rectangle) {
      * MediaBox by default.
      */
     public Rectangle getCropBox() {
-        initParentPages();
         PdfArray cropBox = getPdfObject().getAsArray(PdfName.CropBox);
         if (cropBox == null) {
-            cropBox = (PdfArray) getParentValue(parentPages, PdfName.CropBox);
+            cropBox = (PdfArray) getInheritedValue(PdfName.CropBox, PdfObject.ARRAY);
             if (cropBox == null) {
                 return getMediaBox();
             }
@@ -882,7 +878,6 @@ public int getAnnotsSize() {
     /**
      * This method gets outlines of a current page
      *
-     * @param updateOutlines
      * @return return all outlines of a current page
      */
     public List<PdfOutline> getOutlines(boolean updateOutlines) {
@@ -1155,14 +1150,22 @@ private PdfArray getAnnots(boolean create) {
         return annots;
     }
 
-    private PdfObject getParentValue(PdfPages parentPages, PdfName pdfName) {
+    private PdfObject getInheritedValue(PdfName pdfName, int type) {
+        if (this.parentPages == null) {
+            this.parentPages = getDocument().getCatalog().getPageTree().findPageParent(this);
+        }
+        PdfObject val = getInheritedValue(this.parentPages, pdfName);
+        return val != null && val.getType() == type ? val : null;
+    }
+
+    private static PdfObject getInheritedValue(PdfPages parentPages, PdfName pdfName) {
         if (parentPages != null) {
             PdfDictionary parentDictionary = parentPages.getPdfObject();
             PdfObject value = parentDictionary.get(pdfName);
             if (value != null) {
                 return value;
             } else {
-                return getParentValue(parentPages.getParent(), pdfName);
+                return getInheritedValue(parentPages.getParent(), pdfName);
             }
         }
         return null;
@@ -1262,28 +1265,29 @@ private void flushMustBeIndirectObject(PdfObject obj) {
         obj.makeIndirect(getDocument()).flush();
     }
 
-    /*
-    * initialization <code>parentPages</code> if needed
-    */
-    private void initParentPages() {
-        if (this.parentPages == null) {
-            this.parentPages = getDocument().getCatalog().getPageTree().findPageParent(this);
-        }
-    }
-
     private void copyInheritedProperties(PdfPage copyPdfPage, PdfDocument pdfDocument) {
         if (copyPdfPage.getPdfObject().get(PdfName.Resources) == null) {
             PdfObject copyResource = pdfDocument.getWriter().copyObject(getResources().getPdfObject(), pdfDocument, false);
             copyPdfPage.getPdfObject().put(PdfName.Resources, copyResource);
         }
         if (copyPdfPage.getPdfObject().get(PdfName.MediaBox) == null) {
+            //media box shall be in any case
             copyPdfPage.setMediaBox(getMediaBox());
         }
         if (copyPdfPage.getPdfObject().get(PdfName.CropBox) == null) {
-            initParentPages();
-            PdfArray cropBox = (PdfArray) getParentValue(parentPages, PdfName.CropBox);
+            //original pdfObject don't have CropBox, otherwise copyPdfPage will contain it
+            PdfArray cropBox = (PdfArray) getInheritedValue(PdfName.CropBox, PdfObject.ARRAY);
+            //crop box is optional, we shall not set default value.
             if (cropBox != null) {
-                copyPdfPage.setCropBox(cropBox.toRectangle());
+                copyPdfPage.put(PdfName.CropBox, cropBox);
+            }
+        }
+        if (copyPdfPage.getPdfObject().get(PdfName.Rotate) == null) {
+            //original pdfObject don't have Rotate, otherwise copyPdfPage will contain it
+            PdfNumber rotate = (PdfNumber) getInheritedValue(PdfName.Rotate, PdfObject.NUMBER);
+            //rotate is optional, we shall not set default value.
+            if (rotate != null) {
+                copyPdfPage.put(PdfName.Rotate, rotate);
             }
         }
     }