xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r390672 - in /xmlgraphics/commons/trunk/src: java-1.4/org/ java-1.4/org/apache/ java-1.4/org/apache/xmlgraphics/ java-1.4/org/apache/xmlgraphics/image/ java-1.4/org/apache/xmlgraphics/image/writer/ java-1.4/org/apache/xmlgraphics/image/writ...
Date Sat, 01 Apr 2006 14:09:43 GMT
Author: jeremias
Date: Sat Apr  1 06:09:41 2006
New Revision: 390672

URL: http://svn.apache.org/viewcvs?rev=390672&view=rev
Log:
Ported the ImageWriter implementations from Batik.
Added the makeLinearBufferedImage from Batik's GraphicsUtil (used by one of the ImageWriters).
Extended the ImageWriterRegistry to support priorities. Default priority file added. It is
loaded as a resource and makes sure the ImageWriters that use the internal codecs are used
before the ImageIO implementations.

Added:
    xmlgraphics/commons/trunk/src/java-1.4/org/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java
      - copied, changed from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java
      - copied, changed from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java
      - copied, changed from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java
      - copied, changed from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java
      - copied, changed from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java
      - copied, changed from r390658, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
      - copied, changed from r390658, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
    xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter
      - copied, changed from r381133, xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.spi.ImageWriter
    xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/
    xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/
    xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
  (with props)
Removed:
    xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.spi.ImageWriter
Modified:
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java

Copied: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java
(from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java?p2=xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java&p1=xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java&r1=390653&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -15,7 +15,7 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.imageio;
+package org.apache.xmlgraphics.image.writer.imageio;
 
 import java.awt.image.RenderedImage;
 import java.io.IOException;
@@ -35,8 +35,8 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
 
 /**
  * ImageWriter implementation that uses Image I/O to write images.

Copied: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java
(from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java?p2=xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java&p1=xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java&r1=390653&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -15,7 +15,7 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.imageio;
+package org.apache.xmlgraphics.image.writer.imageio;
 
 import java.awt.image.RenderedImage;
 
@@ -26,7 +26,8 @@
 import javax.imageio.metadata.IIOMetadataNode;
 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+
 
 /**
  * ImageWriter that encodes JPEG images using Image I/O.

Copied: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java
(from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java?p2=xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java&p1=xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java&r1=390653&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -15,7 +15,7 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.imageio;
+package org.apache.xmlgraphics.image.writer.imageio;
 
 /**
  * ImageWriter that encodes PNG images using Image I/O.

Copied: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java
(from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java?p2=xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java&p1=xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java&r1=390653&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -15,7 +15,7 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.imageio;
+package org.apache.xmlgraphics.image.writer.imageio;
 
 /**
  * ImageWriter that encodes TIFF images using Image I/O.

Copied: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java
(from r390653, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java?p2=xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java&p1=xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java&r1=390653&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java
(original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java
Sat Apr  1 06:09:41 2006
@@ -15,7 +15,7 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.imageio;
+package org.apache.xmlgraphics.util;
 
 import javax.imageio.metadata.IIOMetadata;
 import javax.xml.transform.Result;

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java?rev=390672&r1=390671&r2=390672&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java Sat
Apr  1 06:09:41 2006
@@ -123,6 +123,21 @@
     }
 
     /**
+     * Constructs a BufferedImage with a linear sRGB colorModel, and alpha.
+     * @param width   The desired width of the BufferedImage
+     * @param height  The desired height of the BufferedImage
+     * @param premult The desired state of alpha premultiplied
+     * @return        The requested BufferedImage.
+     */
+    public static BufferedImage makeLinearBufferedImage(int width,
+                                                        int height,
+                                                        boolean premult) {
+        ColorModel cm = makeLinear_sRGBCM(premult);
+        WritableRaster wr = cm.createCompatibleWritableRaster(width, height);
+        return new BufferedImage(cm, wr, premult, null);
+    }
+
+    /**
      * This method will return a CacheableRed that has it's data in
      * the sRGB colorspace. If <tt>src</tt> is already in
      * sRGB then this method does nothing and returns <tt>src</tt>.

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java?rev=390672&r1=390671&r2=390672&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -28,13 +28,27 @@
  */
 public interface ImageWriter {
     
+    /**
+     * Encodes an image and writes it to an OutputStream.
+     * @param image the image to be encoded
+     * @param out the OutputStream to write to
+     * @throws IOException In case of an /IO problem
+     */
     public void writeImage(RenderedImage image, OutputStream out) 
             throws IOException;
 
+    /**
+     * Encodes an image and writes it to an OutputStream.
+     * @param image the image to be encoded
+     * @param out the OutputStream to write to
+     * @param params a parameters object to customize the encoding.
+     * @throws IOException In case of an /IO problem
+     */
     public void writeImage(RenderedImage image, OutputStream out, 
             ImageWriterParams params) 
             throws IOException;
 
+    /** @return the target MIME type supported by this ImageWriter */
     public String getMIMEType();
     
 }

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java?rev=390672&r1=390671&r2=390672&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java
Sat Apr  1 06:09:41 2006
@@ -17,9 +17,14 @@
  */
 package org.apache.xmlgraphics.image.writer;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Properties;
 
 import org.apache.xmlgraphics.util.Service;
 
@@ -33,8 +38,40 @@
     private static ImageWriterRegistry instance;
     
     private Map imageWriterMap = new HashMap();
+    private Map preferredOrder;
     
-    private ImageWriterRegistry() {
+    /**
+     * Default constructor. The default preferred order for the image writers is loaded from
the 
+     * resources.
+     */
+    public ImageWriterRegistry() {
+        Properties props = new Properties();
+        InputStream in = getClass().getResourceAsStream("default-preferred-order.properties");
+        if (in != null) {
+            try {
+                try {
+                    props.load(in);
+                } finally {
+                    in.close();
+                }
+            } catch (IOException ioe) {
+                throw new RuntimeException(
+                        "Could not load default preferred order due to I/O error: " 
+                            + ioe.getMessage());
+            }
+        }
+        this.preferredOrder = props;
+        setup();
+    }
+    
+    /**
+     * Special constructor. The preferred order for the image writers can be specified as
a 
+     * Map (for example a Properties file). The entries of the Map consists of fully qualified
+     * class or package names as keys and integer numbers as values. Zero (0) is the default
+     * priority.   
+     */
+    public ImageWriterRegistry(Properties preferredOrder) {
+        this.preferredOrder = preferredOrder;
         setup();
     }
     
@@ -53,6 +90,20 @@
             register(writer);
         }
     }
+
+    private int getPriority(ImageWriter writer) {
+        String key = writer.getClass().getName();
+        Object value = preferredOrder.get(key);
+        while (value == null) {
+            int pos = key.lastIndexOf(".");
+            if (pos < 0) {
+                break;
+            }
+            key = key.substring(0, pos);
+            value = preferredOrder.get(key);
+        }
+        return (value != null) ? Integer.parseInt(value.toString()) : 0;
+    }
     
     /**
      * Registers a new ImageWriter implementation in the registry. If an ImageWriter for
the same
@@ -60,7 +111,24 @@
      * @param writer the ImageWriter instance to register.
      */
     public void register(ImageWriter writer) {
-        imageWriterMap.put(writer.getMIMEType(), writer);
+        List entries = (List)imageWriterMap.get(writer.getMIMEType());
+        if (entries == null) {
+            entries = new java.util.ArrayList();
+            imageWriterMap.put(writer.getMIMEType(), entries);
+        }
+        
+        int priority = getPriority(writer);
+        ListIterator li;
+        li = entries.listIterator();
+        while (li.hasNext()) {
+            ImageWriter w = (ImageWriter)li.next();
+            if (getPriority(w) > priority) {
+                li.previous();
+                li.add(writer);
+                return;
+            }
+        }
+        li.add(writer);
     }
     
     /**
@@ -70,7 +138,12 @@
      *         found.
      */
     public ImageWriter getWriterFor(String mime) {
-        return (ImageWriter)imageWriterMap.get(mime);
+        List entries = (List)imageWriterMap.get(mime);
+        if (entries == null) {
+            return null;
+        } else {
+            return (ImageWriter)entries.get(0);
+        }
     }
-    
+
 }

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java
(from r390658, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java&p1=xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java&r1=390658&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -15,16 +15,16 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.jpeg;
+package org.apache.xmlgraphics.image.writer.internal;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.GraphicsUtil;
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
+import org.apache.xmlgraphics.image.GraphicsUtil;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
 
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGEncodeParam;
@@ -47,7 +47,7 @@
     }
 
     /**
-     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, org.apache.batik.ext.awt.image.spi.ImageWriterParams)
+     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
      */
     public void writeImage(RenderedImage image, OutputStream out,
             ImageWriterParams params) throws IOException {

Copied: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
(from r390658, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java?p2=xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java&p1=xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java&r1=390658&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
(original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
Sat Apr  1 06:09:41 2006
@@ -15,15 +15,15 @@
    limitations under the License.
 
  */
-package org.apache.batik.ext.awt.image.codec.png;
+package org.apache.xmlgraphics.image.writer.internal;
 
 import java.awt.image.RenderedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder;
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
+import org.apache.xmlgraphics.image.codec.png.PNGImageEncoder;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
 
 /**
  * ImageWriter implementation that uses Batik's PNG codec to 
@@ -42,7 +42,7 @@
     }
 
     /**
-     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, org.apache.batik.ext.awt.image.spi.ImageWriterParams)
+     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
      */
     public void writeImage(RenderedImage image, OutputStream out,
             ImageWriterParams params) throws IOException {

Copied: xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter
(from r381133, xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.spi.ImageWriter)
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter?p2=xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter&p1=xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.spi.ImageWriter&r1=381133&r2=390672&rev=390672&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.spi.ImageWriter
(original)
+++ xmlgraphics/commons/trunk/src/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter
Sat Apr  1 06:09:41 2006
@@ -1,5 +1,5 @@
-org.apache.xmlgraphics.image.codec.png.PNGImageWriter
-org.apache.xmlgraphics.image.codec.jpeg.JPEGImageWriter
-#org.apache.xmlgraphics.image.codec.imageio.ImageIOPNGImageWriter
-#org.apache.xmlgraphics.image.codec.imageio.ImageIOTIFFImageWriter
-#org.apache.xmlgraphics.image.codec.imageio.ImageIOJPEGImageWriter
+org.apache.xmlgraphics.image.writer.internal.PNGImageWriter
+org.apache.xmlgraphics.image.writer.internal.JPEGImageWriter
+org.apache.xmlgraphics.image.writer.imageio.ImageIOPNGImageWriter
+org.apache.xmlgraphics.image.writer.imageio.ImageIOTIFFImageWriter
+org.apache.xmlgraphics.image.writer.imageio.ImageIOJPEGImageWriter

Added: xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties?rev=390672&view=auto
==============================================================================
--- xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
(added)
+++ xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
Sat Apr  1 06:09:41 2006
@@ -0,0 +1,2 @@
+org.apache.xmlgraphics.image.writer.internal=1000
+org.apache.xmlgraphics.image.writer.imageio=2000
\ No newline at end of file

Propchange: xmlgraphics/commons/trunk/src/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message