svn commit: r1607905 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight: content/PreflightContentStream.java font/Type3FontValidator.java font/util/PreflightType3Stream.java

[jahewson]

Author: jahewson
Date: Fri Jul  4 18:33:41 2014
New Revision: 1607905

URL: http://svn.apache.org/r1607905
Log:
PDFBOX-2181: Fix IllegalStateException caused by preflight not initing streams

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java?rev=1607905&r1=1607904&r2=1607905&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java
 Fri Jul  4 18:33:41 2014
@@ -121,6 +121,7 @@ public class PreflightContentStream exte
         try
         {
             COSDictionary res = (COSDictionary) 
pattern.getDictionaryObject(COSName.RESOURCES);
+            initStream(processeedPage.findCropBox());
             processSubStream(new PDResources(res), pattern);
         }
         catch (ContentStreamException e)

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java?rev=1607905&r1=1607904&r2=1607905&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java
 Fri Jul  4 18:33:41 2014
@@ -41,6 +41,7 @@ import org.apache.pdfbox.encoding.Dictio
 import org.apache.pdfbox.encoding.Encoding;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDFontFactory;
 import org.apache.pdfbox.preflight.PreflightConstants;
@@ -404,8 +405,7 @@ public class Type3FontValidator extends 
     {
         PreflightPath vPath = context.getValidationPath();
         PreflightType3Stream parser = new PreflightType3Stream(context, 
vPath.getClosestPathElement(PDPage.class));
-        parser.resetEngine();
-        parser.processSubStream(resources, charStream);
+        parser.processStream(resources, charStream, new PDRectangle(0, 0, 
1000, 1000)); // dummy bbox
         return parser.getWidth();
     }
 

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java?rev=1607905&r1=1607904&r2=1607905&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java
 Fri Jul  4 18:33:41 2014
@@ -31,6 +31,7 @@ import org.apache.pdfbox.cos.COSInteger;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.cos.COSStream;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.image.PDInlineImage;
 import org.apache.pdfbox.preflight.PreflightContext;
 import org.apache.pdfbox.preflight.content.PreflightStreamEngine;
@@ -66,8 +67,7 @@ public class PreflightType3Stream extend
      */
     public Image createImage(COSStream type3Stream) throws IOException
     {
-        resetEngine();
-        processSubStream(null, type3Stream);
+        processStream(null, type3Stream, new PDRectangle(0, 0, 1000, 1000)); 
// dummy bbox
         return image.getImage();
     }