Disable checkEOF when processing PS files. It's perfectly valid to have an %%EOF...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1614055 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/xmlgraphics-commons-svn-trunk.jar b/lib/xmlgraphics-commons-svn-trunk.jar
index 944d63df59dfb5db4ca7afea21170b6927a60ffe..bb5e5950d11b62e8c502ff5a93eee3af5a8fb369 100644 (file)
Binary files a/lib/xmlgraphics-commons-svn-trunk.jar and b/lib/xmlgraphics-commons-svn-trunk.jar differ

diff --git a/src/java/org/apache/fop/render/ps/ResourceHandler.java b/src/java/org/apache/fop/render/ps/ResourceHandler.java
index 95b544ec2f8b5f3e8abdd7022d8c42bfff4dfefb..b4e138cffc28a807f20c90d6d6171a5704bb5dd0 100644 (file)
--- a/src/java/org/apache/fop/render/ps/ResourceHandler.java
+++ b/src/java/org/apache/fop/render/ps/ResourceHandler.java
@@ -150,6 +150,7 @@ public class ResourceHandler implements DSCParserConstants, PSSupportedFlavors {
             int pageCount, Rectangle2D documentBoundingBox)
                     throws DSCException, IOException {
         DSCParser parser = new DSCParser(in);
+        parser.setCheckEOF(false);
 
         PSGenerator gen = new PSGenerator(out);
         parser.addListener(new DefaultNestedDocumentHandler(gen));

diff --git a/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java b/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
index 4f06938d20aeba0cc477c9211335e5f070d740fb..8a548b1b523ff27e31ada8503c8e8ce39fd1bc20 100644 (file)
--- a/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
+++ b/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
@@ -83,6 +83,7 @@ public class ResourceOptimizationTestCase extends AbstractPostScriptTest {
         in = new java.io.BufferedInputStream(in);
         try {
             DSCParser parser = new DSCParser(in);
+            parser.setCheckEOF(false);
 
             //The first form is for arrow_down_small.png (to be reused)
             PSResource form1 = new PSResource(PSResource.TYPE_FORM, "FOPForm:1");