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 2015/01/23 19:43:34 UTC

svn commit: r1654304 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java

Author: lehmi
Date: Fri Jan 23 18:43:33 2015
New Revision: 1654304

URL: http://svn.apache.org/r1654304
Log:
PDFBOX-2615: clarify code/comment as endobj tags shall not be used within object streams

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java?rev=1654304&r1=1654303&r2=1654304&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java Fri Jan 23 18:43:33 2015
@@ -100,17 +100,12 @@ public class PDFObjectStreamParser exten
                 {
                     LOG.debug( "parsed=" + object );
                 }
-                // skip endobject marker
-                if (!pdfSource.isEOF())
+                // According to the spec objects within an object stream shall not be enclosed 
+                // by obj/endobj tags, but there are some pdfs in the wild using those tags 
+                // skip endobject marker if present
+                if (!pdfSource.isEOF() && pdfSource.peek() == 'e')
                 {
-                    if ( pdfSource.peek() == 'e')
-                    {
-                        readLine();
-                    }
-                    else
-                    {
-                        LOG.debug("no endobject marker found for object "+objNum+" in object stream");
-                    }
+                    readLine();
                 }
                 objectCounter++;
             }