You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2019/06/22 11:45:46 UTC

svn commit: r1861848 - /pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java

Author: lehmi
Date: Sat Jun 22 11:45:46 2019
New Revision: 1861848

URL: http://svn.apache.org/viewvc?rev=1861848&view=rev
Log:
PDFBOX-4569: switch to ondemand parsing

Modified:
    pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java

Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java?rev=1861848&r1=1861847&r2=1861848&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java Sat Jun 22 11:45:46 2019
@@ -22,7 +22,6 @@ import java.io.InputStream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSDocument;
 import org.apache.pdfbox.cos.COSName;
@@ -102,6 +101,7 @@ public class FDFParser extends COSParser
             }
         }
         document = new COSDocument();
+        document.parser = this;
     }
 
     /**
@@ -115,13 +115,10 @@ public class FDFParser extends COSParser
     {
         COSDictionary trailer = retrieveTrailer();
     
-        COSBase rootObject = parseTrailerValuesDynamically(trailer);
-    
-        // resolve all objects
-        // A FDF doesn't have a catalog, all FDF fields are within the root object
-        if (rootObject instanceof COSDictionary)
+        COSDictionary root = trailer.getCOSDictionary(COSName.ROOT);
+        if (root == null)
         {
-            parseDictObjects((COSDictionary) rootObject, (COSName[]) null);
+            throw new IOException("Missing root object specification in trailer.");
         }
         initialParseDone = true;
     }