From 216547ccfb945b408b73af703aca26973dbdc1be Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Mon, 12 Jan 2009 13:34:11 +0000 Subject: Restrict XML-formats to SVG to stream-line the image loading/conversion process. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@733745 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java | 3 ++- src/java/org/apache/fop/svg/PDFImageElementBridge.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/java/org') diff --git a/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java b/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java index 0ff2ea71d..89b2c83dc 100644 --- a/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java +++ b/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java @@ -21,6 +21,7 @@ package org.apache.fop.afp.svg; import org.apache.xmlgraphics.image.loader.ImageFlavor; +import org.apache.fop.image.loader.batik.BatikImageFlavors; import org.apache.fop.svg.AbstractFOPImageElementBridge; /** @@ -32,7 +33,7 @@ public class AFPImageElementBridge extends AbstractFOPImageElementBridge { {//ImageFlavor.RAW_JPEG, //ImageFlavor.RAW_CCITTFAX, ImageFlavor.GRAPHICS2D, - ImageFlavor.XML_DOM}; + BatikImageFlavors.SVG_DOM}; /** {@inheritDoc} */ protected ImageFlavor[] getSupportedFlavours() { diff --git a/src/java/org/apache/fop/svg/PDFImageElementBridge.java b/src/java/org/apache/fop/svg/PDFImageElementBridge.java index 1a17aa410..4e5983e64 100644 --- a/src/java/org/apache/fop/svg/PDFImageElementBridge.java +++ b/src/java/org/apache/fop/svg/PDFImageElementBridge.java @@ -21,6 +21,8 @@ package org.apache.fop.svg; import org.apache.xmlgraphics.image.loader.ImageFlavor; +import org.apache.fop.image.loader.batik.BatikImageFlavors; + /** * PDF Image Element Bridge class for the <image> element when jpeg images. * @@ -37,10 +39,11 @@ public class PDFImageElementBridge extends AbstractFOPImageElementBridge { {ImageFlavor.RAW_JPEG, ImageFlavor.RAW_CCITTFAX, ImageFlavor.GRAPHICS2D, - ImageFlavor.XML_DOM}; + BatikImageFlavors.SVG_DOM}; /** {@inheritDoc} */ protected ImageFlavor[] getSupportedFlavours() { return supportedFlavors; } + } -- cgit v1.2.3