svn commit: r1409458 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight: PreflightConstants.java parser/PreflightParser.java

[leleueri]

Author: leleueri
Date: Wed Nov 14 21:55:17 2012
New Revision: 1409458

URL: http://svn.apache.org/viewvc?rev=1409458&view=rev
Log:
[https://issues.apache.org/jira/browse/PDFBOX-1374] Now Preflight manage 
"Object Stream" (Object contained by an Object with a type "ObjStm")  
The ObjStm is referenced in the XRefTable with the negative value of the 
ObjectNumber as offset value. Now preflight authorize negative offset.

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java?rev=1409458&r1=1409457&r2=1409458&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
 Wed Nov 14 21:55:17 2012
@@ -348,9 +348,9 @@ public interface PreflightConstants {
         */
        String ERROR_SYNTAX_HEXA_STRING_INVALID= "1.0.12";      
        /**
-        * An object is missing from the document (offset is negative)
+        * An object is missing from the document
         */
-       String ERROR_SYNTAX_NEGATIVE_OFFSET = "1.0.13";
+       String ERROR_SYNTAX_MISSING_OFFSET = "1.0.13";
 
        String ERROR_SYNTAX_HEADER = "1.1";
        

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1409458&r1=1409457&r2=1409458&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
 Wed Nov 14 21:55:17 2012
@@ -554,8 +554,8 @@ public class PreflightParser extends Non
                        Long offsetOrObjstmObNr = 
xrefTrailerResolver.getXrefTable().get( objKey );
 
                        // sanity test to circumvent loops with broken documents
-                       if ( requireExistingNotCompressedObj && ( ( 
offsetOrObjstmObNr == null ) || ( offsetOrObjstmObNr <= 0 ) ) )     {   
-                               addValidationError(new 
ValidationError(ERROR_SYNTAX_NEGATIVE_OFFSET, "Object must be defined and must 
not be compressed object: " +     objKey.getNumber() + ":" + 
objKey.getGeneration()));
+                       if ( requireExistingNotCompressedObj && ( ( 
offsetOrObjstmObNr == null ) ) )    {   
+                               addValidationError(new 
ValidationError(ERROR_SYNTAX_MISSING_OFFSET, "Object must be defined and must 
not be compressed object: " +      objKey.getNumber() + ":" + 
objKey.getGeneration()));
                                throw new SyntaxValidationException( "Object 
must be defined and must not be compressed object: " +     objKey.getNumber() + 
":" + objKey.getGeneration(), validationResult);
                        }