You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2007/12/07 22:30:30 UTC
svn commit: r602228 - in
/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java:
META-INF/services/ org/apache/fop/image2/impl/
org/apache/fop/image2/impl/batik/ org/apache/fop/image2/impl/imageio/
org/apache/fop/image2/spi/
Author: jeremias
Date: Fri Dec 7 13:30:17 2007
New Revision: 602228
URL: http://svn.apache.org/viewvc?rev=602228&view=rev
Log:
Discarded PreloaderPNG in favor of PreloaderImageIO which now supports all formats supported by ImageIO (meaning that you can uses JPEG-2000 images if you have a suitable ImageIO codec installed).
ImagePreloader.getMimeType() removed because it isn't really used in the new setup.
ImagePreloader.getPriority() introduced which allows to prioritize preloaders and thus gives the opportunity to tweak the order in which the preloaders are checked when an image is inspected.
ImageLoaderImageIO can now use multiple Readers if one fails (one codec may not support all format variants, for example).
Added:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java (with props)
Removed:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderPNG.java
Modified:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.fop.image2.spi.ImagePreloader
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImagePreloader.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderBMP.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEMF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEPS.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderGIF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderJPEG.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderTIFF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderSVG.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderWMF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageIOUtil.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageLoaderImageIO.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImageImplRegistry.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImagePreloader.java
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.fop.image2.spi.ImagePreloader
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.fop.image2.spi.ImagePreloader?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.fop.image2.spi.ImagePreloader (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.fop.image2.spi.ImagePreloader Fri Dec 7 13:30:17 2007
@@ -1,9 +1,9 @@
-org.apache.fop.image2.impl.PreloaderPNG
org.apache.fop.image2.impl.PreloaderTIFF
org.apache.fop.image2.impl.PreloaderGIF
org.apache.fop.image2.impl.PreloaderJPEG
org.apache.fop.image2.impl.PreloaderBMP
org.apache.fop.image2.impl.PreloaderEMF
org.apache.fop.image2.impl.PreloaderEPS
+org.apache.fop.image2.impl.imageio.PreloaderImageIO
+org.apache.fop.image2.impl.batik.PreloaderWMF
org.apache.fop.image2.impl.batik.PreloaderSVG
-org.apache.fop.image2.impl.batik.PreloaderWMF
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImagePreloader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImagePreloader.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImagePreloader.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImagePreloader.java Fri Dec 7 13:30:17 2007
@@ -47,4 +47,9 @@
return header;
}
+ /** {@inheritDoc} */
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
}
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderBMP.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderBMP.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderBMP.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderBMP.java Fri Dec 7 13:30:17 2007
@@ -55,17 +55,12 @@
&& (header[1] == (byte) 0x4d));
if (supported) {
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, "image/bmp");
info.setSize(determineSize(in, context));
return info;
} else {
return null;
}
- }
-
- /** {@inheritDoc} */
- public String getMimeType() {
- return "image/bmp";
}
private ImageSize determineSize(ImageInputStream in, ImageContext context)
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEMF.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEMF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEMF.java Fri Dec 7 13:30:17 2007
@@ -70,17 +70,12 @@
&& (header[SIGNATURE_OFFSET + 3] == (byte) 0x46) );
if (supported) {
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, "image/emf");
info.setSize(determineSize(in, context));
return info;
} else {
return null;
}
- }
-
- /** {@inheritDoc} */
- public String getMimeType() {
- return "image/emf";
}
private ImageSize determineSize(ImageInputStream in, ImageContext context)
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEPS.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEPS.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEPS.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderEPS.java Fri Dec 7 13:30:17 2007
@@ -83,7 +83,7 @@
}
if (supported) {
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, MimeConstants.MIME_EPS);
boolean success = determineSize(in, context, info);
in.reset(); //Need to go back to start of file
if (!success) {
@@ -103,11 +103,6 @@
} finally {
in.setByteOrder(originalByteOrder);
}
- }
-
- /** {@inheritDoc} */
- public String getMimeType() {
- return MimeConstants.MIME_EPS;
}
private EPSBinaryFileHeader readBinaryFileHeader(ImageInputStream in) throws IOException {
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderGIF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderGIF.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderGIF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderGIF.java Fri Dec 7 13:30:17 2007
@@ -53,17 +53,12 @@
&& (header[5] == 'a'));
if (supported) {
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, MimeConstants.MIME_GIF);
info.setSize(determineSize(header, context));
return info;
} else {
return null;
}
- }
-
- /** {@inheritDoc} */
- public String getMimeType() {
- return MimeConstants.MIME_GIF;
}
private ImageSize determineSize(byte[] header, ImageContext context) {
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderJPEG.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderJPEG.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderJPEG.java Fri Dec 7 13:30:17 2007
@@ -52,17 +52,12 @@
&& (header[2] == (byte)MARK));
if (supported) {
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, MimeConstants.MIME_JPEG);
info.setSize(determineSize(in, context));
return info;
} else {
return null;
}
- }
-
- /** {@inheritDoc} */
- public String getMimeType() {
- return MimeConstants.MIME_JPEG;
}
private ImageSize determineSize(ImageInputStream in, ImageContext context)
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderTIFF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderTIFF.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderTIFF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/PreloaderTIFF.java Fri Dec 7 13:30:17 2007
@@ -78,17 +78,12 @@
}
if (supported) {
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, MimeConstants.MIME_TIFF);
info.setSize(determineSize(in, context));
return info;
} else {
return null;
}
- }
-
- /** {@inheritDoc} */
- public String getMimeType() {
- return MimeConstants.MIME_TIFF;
}
private ImageSize determineSize(ImageInputStream in, ImageContext context)
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderSVG.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderSVG.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderSVG.java Fri Dec 7 13:30:17 2007
@@ -81,11 +81,6 @@
return info;
}
- /** {@inheritDoc} */
- public String getMimeType() {
- return MimeConstants.MIME_SVG;
- }
-
/**
* This method is put in another class so that the class loader does not
* attempt to load Batik related classes when constructing the SVGPreloader
@@ -128,7 +123,7 @@
float height = UnitProcessor.svgVerticalLengthToUserSpace(
s, SVGOMDocument.SVG_HEIGHT_ATTRIBUTE, uctx);
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, MimeConstants.MIME_SVG);
ImageSize size = new ImageSize();
size.setSizeInMillipoints(Math.round(width * 1000), Math.round(height * 1000));
//Set the resolution to that of the FOUserAgent
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderWMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderWMF.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderWMF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/PreloaderWMF.java Fri Dec 7 13:30:17 2007
@@ -72,11 +72,6 @@
return info;
}
- /** {@inheritDoc} */
- public String getMimeType() {
- return "image/x-wmf"; //Don't use constant so no Batik-dependent class is loaded here
- }
-
/**
* This method is put in another class so that the class loader does not
* attempt to load Batik related classes when constructing the WMFPreloader
@@ -106,7 +101,7 @@
int height = wmfStore.getHeightUnits();
int dpi = wmfStore.getMetaFileUnitsPerInch();
- ImageInfo info = new ImageInfo(uri, getMimeType());
+ ImageInfo info = new ImageInfo(uri, "image/x-wmf");
ImageSize size = new ImageSize();
size.setSizeInPixels(width, height);
size.setResolution(dpi);
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageIOUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageIOUtil.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageIOUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageIOUtil.java Fri Dec 7 13:30:17 2007
@@ -41,6 +41,9 @@
*/
public class ImageIOUtil {
+ /** Key for ImageInfo's custom objects to embed the ImageIO metadata */
+ public static final Object IMAGEIO_METADATA = IIOMetadata.class;
+
/**
* Extracts the resolution information from the standard ImageIO metadata.
* @param iiometa the metadata provided by ImageIO
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageLoaderImageIO.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageLoaderImageIO.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageLoaderImageIO.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/ImageLoaderImageIO.java Fri Dec 7 13:30:17 2007
@@ -28,6 +28,7 @@
import java.util.Map;
import java.util.StringTokenizer;
+import javax.imageio.IIOException;
import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
@@ -38,6 +39,9 @@
import org.w3c.dom.Element;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.image2.Image;
import org.apache.fop.image2.ImageException;
import org.apache.fop.image2.ImageFlavor;
@@ -46,7 +50,6 @@
import org.apache.fop.image2.impl.AbstractImageLoader;
import org.apache.fop.image2.impl.ImageBuffered;
import org.apache.fop.image2.impl.ImageRendered;
-import org.apache.fop.image2.impl.PreloaderPNG;
import org.apache.fop.image2.util.ImageUtil;
/**
@@ -54,6 +57,9 @@
*/
public class ImageLoaderImageIO extends AbstractImageLoader {
+ /** logger */
+ protected static Log log = LogFactory.getLog(ImageLoaderImageIO.class);
+
private ImageFlavor targetFlavor;
/**
@@ -76,26 +82,49 @@
/** {@inheritDoc} */
public Image loadImage(ImageInfo info, Map hints, ImageSessionContext session)
throws ImageException, IOException {
+ BufferedImage imageData = null;
+ IIOException firstException = null;
+
+ IIOMetadata iiometa = (IIOMetadata)info.getCustomObjects().get(
+ ImageIOUtil.IMAGEIO_METADATA);
+ boolean ignoreMetadata = (iiometa != null);
+
Source src = session.needSource(info.getOriginalURI());
ImageInputStream imgStream = ImageUtil.needImageInputStream(src);
- Iterator iter = ImageIO.getImageReaders(imgStream);
- if (!iter.hasNext()) {
+ try {
+ Iterator iter = ImageIO.getImageReaders(imgStream);
+ while (iter.hasNext()) {
+ ImageReader reader = (ImageReader)iter.next();
+ imgStream.mark();
+ ImageReadParam param = reader.getDefaultReadParam();
+ reader.setInput(imgStream, false, ignoreMetadata);
+ final int pageIndex = 0; //Always the first page at the moment
+ try {
+ imageData = reader.read(pageIndex, param);
+ if (iiometa == null) {
+ iiometa = reader.getImageMetadata(pageIndex);
+ }
+ break; //Quit early, we have the image
+ } catch (IIOException iioe) {
+ if (firstException == null) {
+ firstException = iioe;
+ } else {
+ log.debug("non-first error loading image: " + iioe.getMessage());
+ }
+ }
+ imgStream.reset();
+ }
+ } finally {
+ ImageUtil.closeQuietly(src);
+ }
+ if (firstException != null) {
+ throw new ImageException("Error while loading image: "
+ + firstException.getMessage(), firstException);
+ }
+ if (imageData == null) {
throw new ImageException("No ImageIO ImageReader found .");
}
- IIOMetadata iiometa = (IIOMetadata)info.getCustomObjects().get(
- PreloaderPNG.IMAGEIO_METADATA);
- boolean ignoreMetadata = (iiometa != null);
-
- ImageReader reader = (ImageReader)iter.next();
- ImageReadParam param = reader.getDefaultReadParam();
- reader.setInput(imgStream, true, ignoreMetadata);
- final int pageIndex = 0; //Always the first page at the moment
- BufferedImage imageData = reader.read(pageIndex, param);
- if (iiometa == null) {
- iiometa = reader.getImageMetadata(pageIndex);
- }
-
ColorModel cm = imageData.getColorModel();
Color transparentColor = null;
Added: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java?rev=602228&view=auto
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java (added)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java Fri Dec 7 13:30:17 2007
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.image2.impl.imageio;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.stream.ImageInputStream;
+import javax.xml.transform.Source;
+
+import org.apache.fop.image2.ImageContext;
+import org.apache.fop.image2.ImageException;
+import org.apache.fop.image2.ImageInfo;
+import org.apache.fop.image2.ImageSize;
+import org.apache.fop.image2.impl.AbstractImagePreloader;
+import org.apache.fop.image2.util.ImageUtil;
+
+/**
+ * Image preloader for images supported by ImageIO.
+ * <p>
+ * Note: The implementation relies on the presence of a working ImageIO implementation which
+ * provides accurate image metadata. This is particularly important for PNG image because the
+ * PNG loader relies on that.
+ */
+public class PreloaderImageIO extends AbstractImagePreloader {
+
+ /** {@inheritDoc}
+ * @throws ImageException */
+ public ImageInfo preloadImage(String uri, Source src, ImageContext context)
+ throws IOException, ImageException {
+ if (!ImageUtil.hasImageInputStream(src)) {
+ return null;
+ }
+ ImageInputStream in = ImageUtil.needImageInputStream(src);
+ Iterator iter = ImageIO.getImageReaders(in);
+ if (!iter.hasNext()) {
+ return null;
+ }
+
+ IIOMetadata iiometa = null;
+ ImageSize size = null;
+ String mime = null;
+ while (iter.hasNext()) {
+ in.mark();
+
+ ImageReader reader = (ImageReader)iter.next();
+ try {
+ reader.setInput(ImageUtil.ignoreFlushing(in), true, false);
+ final int imageIndex = 0;
+ iiometa = reader.getImageMetadata(imageIndex);
+ size = new ImageSize();
+ size.setSizeInPixels(reader.getWidth(imageIndex), reader.getHeight(imageIndex));
+ mime = reader.getOriginatingProvider().getMIMETypes()[0];
+ break;
+ } catch (IOException ioe) {
+ //ignore and continue
+ } finally {
+ reader.dispose();
+ in.reset();
+ }
+ }
+
+ //Resolution (first a default, then try to read the metadata)
+ size.setResolution(context.getSourceResolution());
+ ImageIOUtil.extractResolution(iiometa, size);
+ if (size.getWidthMpt() == 0) {
+ size.calcSizeFromPixels();
+ }
+
+ ImageInfo info = new ImageInfo(uri, mime);
+ info.getCustomObjects().put(ImageIOUtil.IMAGEIO_METADATA, iiometa);
+ info.setSize(size);
+
+ return info;
+ }
+
+ /** {@inheritDoc} */
+ public int getPriority() {
+ //Lower priority than default to give the specialized preloaders a chance.
+ return 2 * DEFAULT_PRIORITY;
+ }
+
+}
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/imageio/PreloaderImageIO.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImageImplRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImageImplRegistry.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImageImplRegistry.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImageImplRegistry.java Fri Dec 7 13:30:17 2007
@@ -21,6 +21,7 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -44,6 +45,8 @@
/** Holds the list of preloaders */
private List preloaders = new java.util.ArrayList();
//Content: List<ImagePreloader>
+ private int lastPreloaderIdentifier;
+ private int lastPreloaderSort;
/** Holds the list of ImageLoaderFactories */
private Map loaders = new java.util.HashMap();
@@ -107,11 +110,50 @@
public void registerPreloader(ImagePreloader preloader) {
if (log.isDebugEnabled()) {
log.debug("Registered " + preloader.getClass().getName()
- + ": MIME = " + preloader.getMimeType());
+ + " with priority " + preloader.getPriority());
}
- preloaders.add(preloader);
+ preloaders.add(newPreloaderHolder(preloader));
}
+ private synchronized PreloaderHolder newPreloaderHolder(ImagePreloader preloader) {
+ PreloaderHolder holder = new PreloaderHolder();
+ holder.preloader = preloader;
+ holder.identifier = ++lastPreloaderIdentifier;
+ return holder;
+ }
+
+ private class PreloaderHolder {
+ private ImagePreloader preloader;
+ private int identifier;
+
+ public String toString() {
+ return preloader + " " + identifier;
+ }
+ }
+
+ private synchronized void sortPreloaders() {
+ if (this.lastPreloaderIdentifier != this.lastPreloaderSort) {
+ Collections.sort(this.preloaders, new Comparator() {
+
+ public int compare(Object o1, Object o2) {
+ PreloaderHolder h1 = (PreloaderHolder)o1;
+ PreloaderHolder h2 = (PreloaderHolder)o2;
+ int p1 = h1.preloader.getPriority();
+ int p2 = h2.preloader.getPriority();
+ int diff = p1 - p2;
+ if (diff != 0) {
+ return diff;
+ } else {
+ diff = h1.identifier - h2.identifier;
+ return diff;
+ }
+ }
+
+ });
+ this.lastPreloaderSort = lastPreloaderIdentifier;
+ }
+ }
+
/**
* Registers a new ImageLoaderFactory.
* @param loaderFactory An ImageLoaderFactory instance
@@ -189,7 +231,29 @@
* @return an iterator over ImagePreloader instances.
*/
public Iterator getPreloaderIterator() {
- return this.preloaders.iterator();
+ sortPreloaders();
+ final Iterator iter = this.preloaders.iterator();
+ //Unpack the holders
+ return new Iterator() {
+
+ public boolean hasNext() {
+ return iter.hasNext();
+ }
+
+ public Object next() {
+ Object obj = iter.next();
+ if (obj != null) {
+ return ((PreloaderHolder)obj).preloader;
+ } else {
+ return null;
+ }
+ }
+
+ public void remove() {
+ iter.remove();
+ }
+
+ };
}
/**
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImagePreloader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImagePreloader.java?rev=602228&r1=602227&r2=602228&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImagePreloader.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/ImagePreloader.java Fri Dec 7 13:30:17 2007
@@ -34,6 +34,9 @@
*/
public interface ImagePreloader {
+ /** Default priority for preloaders */
+ public static final int DEFAULT_PRIORITY = 1000;
+
/**
* "Preloads" an image, i.e. indentifies whether the source image is supported by this
* implementation and determines the image's intrinsic size and possibly some additional
@@ -47,11 +50,11 @@
*/
ImageInfo preloadImage(String originalURI,
Source src, ImageContext context) throws ImageException, IOException;
-
+
/**
- * Returns the MIME type supported by the image preloader.
- * @return the MIME type
+ * Returns the priority of the preloader. The lower the value, the higher the preloader's
+ * priority.
+ * @return an integer (default is 1000)
*/
- String getMimeType();
-
+ int getPriority();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org