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 2017/08/01 20:23:50 UTC
svn commit: r1803701 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Author: tilman
Date: Tue Aug 1 20:23:50 2017
New Revision: 1803701
URL: http://svn.apache.org/viewvc?rev=1803701&view=rev
Log:
PDFBOX-2852: remove unneeded nullcheck; remove dead store; use entrySet
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1803701&r1=1803700&r2=1803701&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Tue Aug 1 20:23:50 2017
@@ -1324,9 +1324,9 @@ public class COSParser extends BaseParse
{
List<COSObjectKey> objStreams = new ArrayList<COSObjectKey>();
// find all object streams
- for (COSObjectKey key : xrefOffset.keySet())
+ for (Entry<COSObjectKey, Long> entry : xrefOffset.entrySet())
{
- Long offset = xrefOffset.get(key);
+ Long offset = entry.getValue();
if (offset != null && offset < 0)
{
COSObjectKey objStream = new COSObjectKey(-offset, 0);
@@ -1456,7 +1456,6 @@ public class COSParser extends BaseParse
// is the next char a digit?
if (isDigit(genID))
{
- genID -= 48;
tempOffset--;
source.seek(tempOffset);
if (isSpace())
@@ -1807,27 +1806,24 @@ public class COSParser extends BaseParse
continue;
}
COSDictionary dictionary = parseCOSDictionary();
- if (dictionary != null)
+ // document catalog
+ if (isCatalog(dictionary))
{
- // document catalog
- if (isCatalog(dictionary))
- {
- trailer.setItem(COSName.ROOT, document.getObjectFromPool(entry.getKey()));
- }
- // info dictionary
- else if (dictionary.containsKey(COSName.MOD_DATE) &&
- (dictionary.containsKey(COSName.TITLE)
- || dictionary.containsKey(COSName.AUTHOR)
- || dictionary.containsKey(COSName.SUBJECT)
- || dictionary.containsKey(COSName.KEYWORDS)
- || dictionary.containsKey(COSName.CREATOR)
- || dictionary.containsKey(COSName.PRODUCER)
- || dictionary.containsKey(COSName.CREATION_DATE)))
- {
- trailer.setItem(COSName.INFO, document.getObjectFromPool(entry.getKey()));
- }
- // TODO encryption dictionary
+ trailer.setItem(COSName.ROOT, document.getObjectFromPool(entry.getKey()));
+ }
+ // info dictionary
+ else if (dictionary.containsKey(COSName.MOD_DATE) &&
+ (dictionary.containsKey(COSName.TITLE)
+ || dictionary.containsKey(COSName.AUTHOR)
+ || dictionary.containsKey(COSName.SUBJECT)
+ || dictionary.containsKey(COSName.KEYWORDS)
+ || dictionary.containsKey(COSName.CREATOR)
+ || dictionary.containsKey(COSName.PRODUCER)
+ || dictionary.containsKey(COSName.CREATION_DATE)))
+ {
+ trailer.setItem(COSName.INFO, document.getObjectFromPool(entry.getKey()));
}
+ // TODO encryption dictionary
}
catch(IOException exception)
{