You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/03/24 20:52:33 UTC
svn commit: r1668972 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Author: tilman
Date: Tue Mar 24 19:52:33 2015
New Revision: 1668972
URL: http://svn.apache.org/r1668972
Log:
PDFBOX-2576: combine nested if statements
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=1668972&r1=1668971&r2=1668972&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 Tue Mar 24 19:52:33 2015
@@ -1156,14 +1156,12 @@ public class COSParser extends BaseParse
Long objectOffset = objectEntry.getValue();
// a negative offset number represents a object number itself
// see type 2 entry in xref stream
- if (objectOffset != null && objectOffset >= 0)
+ if (objectOffset != null && objectOffset >= 0
+ && !checkObjectKeys(objectKey, objectOffset))
{
- if (!checkObjectKeys(objectKey,objectOffset))
- {
- LOG.debug("Stop checking xref offsets as at least one couldn't be dereferenced");
- bruteForceSearch = true;
- break;
- }
+ LOG.debug("Stop checking xref offsets as at least one couldn't be dereferenced");
+ bruteForceSearch = true;
+ break;
}
}
if (bruteForceSearch)
@@ -1827,6 +1825,7 @@ public class COSParser extends BaseParse
*/
private void parseXrefStream(COSStream stream, long objByteOffset, boolean isStandalone) throws IOException
{
+//LOG.info ("parseXrefStream: objByteOffset = " + objByteOffset);
// the cross reference stream of a hybrid xref table will be added to the existing one
// and we must not override the offset and the trailer
if ( isStandalone )