From 8651432157e0fc3871f46c67924fbd81aa3e1b15 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 15 Apr 2005 14:23:50 +0000
Subject: [PATCH] Switch back to ImageIO.read() on CVS HEAD (we stay with
 Toolkit.createImage() on helma_1_4 branch for now)

---
 src/helma/image/imageio/ImageIOGenerator.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/helma/image/imageio/ImageIOGenerator.java b/src/helma/image/imageio/ImageIOGenerator.java
index 3fcdaf73..4fb365b0 100644
--- a/src/helma/image/imageio/ImageIOGenerator.java
+++ b/src/helma/image/imageio/ImageIOGenerator.java
@@ -44,10 +44,10 @@ public class ImageIOGenerator extends ImageGenerator {
      * @return the newly created image
      * @throws IOException
      */
-    /* public Image read(String filename)
+    public Image read(String filename)
     throws IOException {
         return ImageIO.read(new File(filename));
-    } */
+    }
     
     /**
      * @param url the URL the filename of the image to create
@@ -55,10 +55,10 @@ public class ImageIOGenerator extends ImageGenerator {
      * @return the newly created image
      * @throws IOException
      */
-    /* public Image read(URL url)
+    public Image read(URL url)
     throws IOException {
         return ImageIO.read(url);
-    } */
+    }
     
     /**
      * @param src the data of the image to create
@@ -66,10 +66,10 @@ public class ImageIOGenerator extends ImageGenerator {
      * @return the newly created image
      * @throws IOException
      */
-    /* public Image read(byte[] src)
+    public Image read(byte[] src)
     throws IOException {
         return ImageIO.read(new ByteArrayInputStream(src));
-    } */
+    }
 
     /**
      * Saves the image. Image format is deduced from filename.