You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2014/11/02 17:52:42 UTC
svn commit: r1636152 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser:
NonSequentialPDFParser.java PDFParser.java
Author: msahyoun
Date: Sun Nov 2 16:52:41 2014
New Revision: 1636152
URL: http://svn.apache.org/r1636152
Log:
PDFBOX-2461 fix some additional Checkstyle errors.
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java?rev=1636152&r1=1636151&r2=1636152&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java Sun Nov 2 16:52:41 2014
@@ -392,24 +392,24 @@ public class NonSequentialPDFParser exte
*/
protected void initialParse() throws IOException
{
- COSDictionary trailer = null;
+ COSDictionary trailer = null;
// ---- parse startxref
- long startXRefOffset = getStartxrefOffset();
- if (startXRefOffset > 0)
- {
- trailer = parseXref(startXRefOffset);
- }
- else if (isFDFDocment || isLenient)
- {
+ long startXRefOffset = getStartxrefOffset();
+ if (startXRefOffset > 0)
+ {
+ trailer = parseXref(startXRefOffset);
+ }
+ else if (isFDFDocment || isLenient)
+ {
// signal start of new XRef
xrefTrailerResolver.nextXrefObj( startXRefOffset, XRefType.TABLE );
- bfSearchForObjects();
- for (COSObjectKey objectKey : bfSearchCOSObjectKeyOffsets.keySet())
- {
- xrefTrailerResolver.setXRef(objectKey, bfSearchCOSObjectKeyOffsets.get(objectKey));
- }
+ bfSearchForObjects();
+ for (COSObjectKey objectKey : bfSearchCOSObjectKeyOffsets.keySet())
+ {
+ xrefTrailerResolver.setXRef(objectKey, bfSearchCOSObjectKeyOffsets.get(objectKey));
+ }
// parse the last trailer.
- pdfSource.seek(trailerOffset);
+ pdfSource.seek(trailerOffset);
if (!parseTrailer())
{
throw new IOException("Expected trailer object at position: "
@@ -419,9 +419,9 @@ public class NonSequentialPDFParser exte
trailer = xrefTrailerResolver.getCurrentTrailer();
document.setTrailer(trailer);
document.setIsXRefStream(false);
- }
+ }
// ---- prepare decryption if necessary
- prepareDecryption();
+ prepareDecryption();
// PDFBOX-1557 - ensure that all COSObject are loaded in the trailer
// PDFBOX-1606 - after securityHandler has been instantiated
@@ -446,7 +446,7 @@ public class NonSequentialPDFParser exte
// ---- resolve all objects
if (isFDFDocment)
{
- // A FDF doesn't have a catalog, all FDF fields are within the root object
+ // A FDF doesn't have a catalog, all FDF fields are within the root object
if (rootObject instanceof COSDictionary)
{
parseDictObjects((COSDictionary) rootObject, (COSName[]) null);
@@ -762,35 +762,35 @@ public class NonSequentialPDFParser exte
if (bufOff < 0)
{
- if (isLenient)
- {
- // in lenient mode the '%%EOF' isn't needed
- bufOff = buf.length;
- LOG.debug("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
- }
- else
- {
- throw new IOException("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
- }
+ if (isLenient)
+ {
+ // in lenient mode the '%%EOF' isn't needed
+ bufOff = buf.length;
+ LOG.debug("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
+ }
+ else
+ {
+ throw new IOException("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
+ }
}
// ---- find last startxref preceding EOF marker
bufOff = lastIndexOf(STARTXREF_MARKER, buf, bufOff);
if (bufOff < 0)
{
- if (isLenient)
- {
+ if (isLenient)
+ {
trailerOffset = lastIndexOf(TRAILER_MARKER, buf, buf.length);
if (trailerOffset > 0)
{
- trailerOffset += skipBytes;
+ trailerOffset += skipBytes;
}
- return -1;
- }
- else
- {
- throw new IOException("Missing 'startxref' marker.");
- }
+ return -1;
+ }
+ else
+ {
+ throw new IOException("Missing 'startxref' marker.");
+ }
}
return skipBytes + bufOff;
}
@@ -916,17 +916,17 @@ public class NonSequentialPDFParser exte
// a FDF doesn't have any pages
if (!isFDFDocment)
{
- final int pageCount = getPageNumber();
-
- if (!allPagesParsed)
- {
- for (int pNr = 0; pNr < pageCount; pNr++)
- {
- getPage(pNr);
- }
- allPagesParsed = true;
- document.setDecrypted();
- }
+ final int pageCount = getPageNumber();
+
+ if (!allPagesParsed)
+ {
+ for (int pNr = 0; pNr < pageCount; pNr++)
+ {
+ getPage(pNr);
+ }
+ allPagesParsed = true;
+ document.setDecrypted();
+ }
}
exceptionOccurred = false;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java?rev=1636152&r1=1636151&r2=1636152&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java Sun Nov 2 16:52:41 2014
@@ -409,7 +409,7 @@ public class PDFParser extends BaseParse
}
else
{
- isFDFDocment = true;
+ isFDFDocment = true;
if (!header.matches(FDF_HEADER + "\\d.\\d"))
{
if (header.length() < FDF_HEADER.length() + 3)