jeremias 2002/11/13 02:29:47 Modified: src/org/apache/fop/image Tag: fop-0_20_2-maintain SVGImage.java Log: Adjust for Batik 1.5b4 Revision Changes Path No revision No revision 1.7.2.2 +9 -7 xml-fop/src/org/apache/fop/image/Attic/SVGImage.java Index: SVGImage.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/Attic/SVGImage.java,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -r1.7.2.1 -r1.7.2.2 --- SVGImage.java 25 Mar 2002 18:08:27 -0000 1.7.2.1 +++ SVGImage.java 13 Nov 2002 10:29:47 -0000 1.7.2.2 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. + * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. */ @@ -9,6 +9,9 @@ // Java import java.net.URL; + +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; import org.w3c.dom.svg.SVGDocument; // FOP @@ -18,9 +21,7 @@ import org.apache.fop.pdf.PDFColor; import org.apache.fop.image.analyser.ImageReader; -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; - +//Batik import org.apache.batik.dom.svg.SAXSVGDocumentFactory; /** @@ -28,7 +29,8 @@ * @see FopImage */ public class SVGImage extends AbstractFopImage { - SVGDocument doc; + + private SVGDocument doc; public SVGImage(URL href) throws FopImageException { super(href); @@ -52,7 +54,7 @@ try { SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(SVGImage.getParserName()); - doc = factory.createDocument(this.m_href.toExternalForm()); + doc = factory.createSVGDocument(this.m_href.toExternalForm()); } catch (Exception e) { MessageHandler.errorln("Could not load external SVG: " + e.getMessage());
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]