updated to latest batik, hopefully api compatible with upcoming 1.1 release

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@194584 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/batik.jar b/lib/batik.jar
index 51466695ec1d54df415a68dd123f2f1aacaf590e..465753a7edbda3880025cbe4091d090cbe0d07ff 100644 (file)
Binary files a/lib/batik.jar and b/lib/batik.jar differ

diff --git a/src/org/apache/fop/image/analyser/SVGReader.java b/src/org/apache/fop/image/analyser/SVGReader.java
index 1178bf9031ceed0f620903c7d592ac97e11d6930..a082a4e10608dd16c61c7228fd51a7ce1dbf5bac 100644 (file)
--- a/src/org/apache/fop/image/analyser/SVGReader.java
+++ b/src/org/apache/fop/image/analyser/SVGReader.java
@@ -160,6 +160,9 @@ public class SVGReader extends AbstractImageReader {
             return "";
         }
 
+public boolean isXMLParserValidating() {
+return true;
+}
 
         /**
          * Returns the user stylesheet uri.

diff --git a/src/org/apache/fop/render/ps/PSGraphics2D.java b/src/org/apache/fop/render/ps/PSGraphics2D.java
index 67859e351b414f9e66a5de718bd0ced80d1b1692..d2fe4d3b2d81a8c3cd3f7bcc9b1f2de73744a33b 100644 (file)
--- a/src/org/apache/fop/render/ps/PSGraphics2D.java
+++ b/src/org/apache/fop/render/ps/PSGraphics2D.java
@@ -245,6 +245,9 @@ public class PSGraphics2D extends AbstractGraphics2D {
             this.m_bitmaps = result;
             this.m_mask = mask;
         }
+    public boolean invertImage() {
+return false;
+}
 
         public String getURL() {
             return "" + m_bitmaps;

diff --git a/src/org/apache/fop/svg/PDFGraphics2D.java b/src/org/apache/fop/svg/PDFGraphics2D.java
index 63493cacc60f744c254c1ba2cbd072b3d8f6bca3..a83a916bb556a8fef5c453c78b98a285b13aa722 100644 (file)
--- a/src/org/apache/fop/svg/PDFGraphics2D.java
+++ b/src/org/apache/fop/svg/PDFGraphics2D.java
@@ -334,6 +334,10 @@ public class PDFGraphics2D extends AbstractGraphics2D {
             this.m_mask = mask;
         }
 
+    public boolean invertImage() {
+return false;
+}
+
         public String getURL() {
             return "" + m_bitmaps;
         }

diff --git a/src/org/apache/fop/svg/PDFTranscoder.java b/src/org/apache/fop/svg/PDFTranscoder.java
index 21f5b5641ae2e2fc1192d61175d412fb002e2a56..64f79167e8317829d2e22be363299169fc5aa0e7 100644 (file)
--- a/src/org/apache/fop/svg/PDFTranscoder.java
+++ b/src/org/apache/fop/svg/PDFTranscoder.java
@@ -313,6 +313,10 @@ public class PDFTranscoder extends XMLAbstractTranscoder {
      */
     protected class ImageTranscoderUserAgent implements UserAgent {
 
+    public boolean isXMLParserValidating() {
+        return true;
+    }
+
         /**
          * Returns the default size of this user agent (400x400).
          */

diff --git a/src/org/apache/fop/svg/SVGUserAgent.java b/src/org/apache/fop/svg/SVGUserAgent.java
index 52873f18ada6d01b656116350a208152635a8854..10672e4ebc16fff1a281a1f77eae9744b7da8608 100644 (file)
--- a/src/org/apache/fop/svg/SVGUserAgent.java
+++ b/src/org/apache/fop/svg/SVGUserAgent.java
@@ -141,6 +141,10 @@ public class SVGUserAgent implements UserAgent {
         return false;
     }
 
+    public boolean isXMLParserValidating() {
+        return true;
+    }
+
     public void registerExtension(BridgeExtension be) {}
 
     public void handleElement(Element elt, Object data) {}