pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From til...@apache.org
Subject svn commit: r1654667 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Date Sun, 25 Jan 2015 16:37:21 GMT
Author: tilman
Date: Sun Jan 25 16:37:20 2015
New Revision: 1654667

URL: http://svn.apache.org/r1654667
Log:
PDFBOX-2576: avoid inner assignments; combine if statements; move trailing comments

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1654667&r1=1654666&r2=1654667&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Sun Jan 25
16:37:20 2015
@@ -354,7 +354,8 @@ public class COSParser extends BaseParse
         {
             final int trailByteCount = (fileLen < readTrailBytes) ? (int) fileLen : readTrailBytes;
             buf = new byte[trailByteCount];
-            pdfSource.seek(skipBytes = fileLen - trailByteCount);
+            skipBytes = fileLen - trailByteCount;
+            pdfSource.seek(skipBytes);
             int off = 0;
             int readBytes;
             while (off < trailByteCount)
@@ -759,7 +760,8 @@ public class COSParser extends BaseParse
                         if (endObjectKey.length() == 0)
                         {
                             // no other characters in extra endstream line
-                            endObjectKey = readLine(); // read next line
+                            // read next line
+                            endObjectKey = readLine();
                         }
                     }
                 }
@@ -1560,23 +1562,19 @@ public class COSParser extends BaseParse
         }
     
         // This is used if there is garbage after the header on the same line
-        if (header.startsWith(headerMarker))
+        if (header.startsWith(headerMarker) && !header.matches(headerMarker + "\\d.\\d"))
         {
-            if (!header.matches(headerMarker + "\\d.\\d"))
+            if (header.length() < headerMarker.length() + 3)
             {
-    
-                if (header.length() < headerMarker.length() + 3)
-                {
-                    // No version number at all, set to 1.4 as default
-                    header = headerMarker + defaultVersion;
-                    LOG.debug("No version found, set to " + defaultVersion + " as default.");
-                }
-                else
-                {
-                    String headerGarbage = header.substring(headerMarker.length() + 3, header.length())
+ "\n";
-                    header = header.substring(0, headerMarker.length() + 3);
-                    pdfSource.unread(headerGarbage.getBytes(ISO_8859_1));
-                }
+                // No version number at all, set to 1.4 as default
+                header = headerMarker + defaultVersion;
+                LOG.debug("No version found, set to " + defaultVersion + " as default.");
+            }
+            else
+            {
+                String headerGarbage = header.substring(headerMarker.length() + 3, header.length())
+ "\n";
+                header = header.substring(0, headerMarker.length() + 3);
+                pdfSource.unread(headerGarbage.getBytes(ISO_8859_1));
             }
         }
         document.setHeaderString(header);
@@ -1662,8 +1660,12 @@ public class COSParser extends BaseParse
         // Xref tables can have multiple sections. Each starts with a starting object id
and a count.
         while(true)
         {
-            long currObjID = readObjectNumber(); // first obj id
-            long count = readLong(); // the number of objects in the xref table
+            // first obj id
+            long currObjID = readObjectNumber(); 
+            
+            // the number of objects in the xref table
+            long count = readLong();
+            
             skipSpaces();
             for(int i = 0; i < count; i++)
             {



Mime
View raw message