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 2014/12/08 22:31:15 UTC

svn commit: r1643933 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java

Author: jahewson
Date: Mon Dec  8 21:31:14 2014
New Revision: 1643933

URL: http://svn.apache.org/r1643933
Log:
PDFBOX-2546: PageIterator should be recursive

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java

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=1643933&r1=1643932&r2=1643933&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 Mon Dec  8 21:31:14 2014
@@ -137,7 +137,15 @@ public class PDPageTree implements COSOb
         {
             if (isPageTreeNode(node))
             {
-                queue.addAll(getKids(node));
+                List<COSDictionary> kids = getKids(node);
+                for (COSDictionary kid : kids)
+                {
+                    enqueueKids(kid);
+                }
+            }
+            else
+            {
+                queue.add(node);
             }
         }
 
@@ -151,7 +159,13 @@ public class PDPageTree implements COSOb
         public PDPage next()
         {
             COSDictionary next = queue.poll();
-            enqueueKids(next);
+
+            // sanity check
+            if (next.getCOSName(COSName.TYPE) != COSName.PAGE)
+            {
+                throw new IllegalStateException("Expected Page but got " + next);
+            }
+
             return new PDPage(next);
         }