You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/12/11 19:41:27 UTC
svn commit: r1719489 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel:
PDDocument.java PDPageTree.java
Author: jahewson
Date: Fri Dec 11 18:41:27 2015
New Revision: 1719489
URL: http://svn.apache.org/viewvc?rev=1719489&view=rev
Log:
PDFBOX-3154: repair bad single-page page trees
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java?rev=1719489&r1=1719488&r2=1719489&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java Fri Dec 11 18:41:27 2015
@@ -1154,7 +1154,11 @@ public class PDDocument implements Close
return getDocumentCatalog().getPages().get(pageIndex);
}
- // todo: new!
+ /**
+ * Returns the page tree.
+ *
+ * @return the page tree
+ */
public PDPageTree getPages()
{
return getDocumentCatalog().getPages();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java?rev=1719489&r1=1719488&r2=1719489&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java Fri Dec 11 18:41:27 2015
@@ -59,12 +59,7 @@ public class PDPageTree implements COSOb
*/
public PDPageTree(COSDictionary root)
{
- if (root == null)
- {
- throw new IllegalArgumentException("root cannot be null");
- }
- this.root = root;
- document = null;
+ this(root, null);
}
/**
@@ -79,7 +74,19 @@ public class PDPageTree implements COSOb
{
throw new IllegalArgumentException("root cannot be null");
}
- this.root = root;
+ // repair bad PDFs which contain a Page dict instead of a page tree, see PDFBOX-3154
+ if (COSName.PAGE.equals(root.getCOSName(COSName.TYPE)))
+ {
+ COSArray kids = new COSArray();
+ kids.add(root);
+ this.root = new COSDictionary();
+ this.root.setItem(COSName.KIDS, kids);
+ this.root.setInt(COSName.COUNT, 1);
+ }
+ else
+ {
+ this.root = root;
+ }
this.document = document;
}