You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/05/14 02:39:49 UTC
svn commit: r537688 -
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
Author: almaw
Date: Sun May 13 17:39:49 2007
New Revision: 537688
URL: http://svn.apache.org/viewvc?view=rev&rev=537688
Log:
Fix WICKET-553 - fix GIF output on JDK 6, and fix resource leak in Image writing.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java?view=diff&rev=537688&r1=537687&r2=537688
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/DynamicImageResource.java Sun May 13 17:39:49 2007
@@ -22,7 +22,6 @@
import java.util.Locale;
import javax.imageio.ImageIO;
-import javax.imageio.ImageWriter;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.DynamicWebResource;
@@ -147,14 +146,9 @@
{
// Create output stream
final ByteArrayOutputStream out = new ByteArrayOutputStream();
-
- // Get image writer for format
- final ImageWriter writer = (ImageWriter) ImageIO.
- getImageWritersByFormatName(format).next();
-
- // Write out image
- writer.setOutput(ImageIO.createImageOutputStream(out));
- writer.write(image);
+
+ // Write image using any matching ImageWriter
+ ImageIO.write(image, format, out);
// Return the image data
return out.toByteArray();