[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small imageio fixes

[Kaffe CVS]

PatchSet 5335 
Date: 2004/10/23 13:54:26
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small imageio fixes

2004-10-23  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/javax/imageio/ImageWriter.java,
        libraries/javalib/javax/imageio/stream/FileCacheImageInputStream.java:
        Resynced with GNU Classpath.

        2004-10-20  Michael Koch  <konqueror at gmx.de>

        * javax/imageio/ImageWriter.java
        (convertImageMetadata): New abstract method.
        (convertStreamMetadata): Likewise.
        (write): Likewise.
        * javax/imageio/stream/FileCacheImageInputStream.java
        (close): Fixed setting of stream to null.
        (checkStreamClosed): Throws IOException.

Members: 
	ChangeLog:1.2887->1.2888 
	libraries/javalib/javax/imageio/ImageWriter.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2887 kaffe/ChangeLog:1.2888
--- kaffe/ChangeLog:1.2887	Sat Oct 23 13:24:34 2004
+++ kaffe/ChangeLog	Sat Oct 23 13:54:26 2004
@@ -1,5 +1,21 @@
 2004-10-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/javax/imageio/ImageWriter.java,
+	libraries/javalib/javax/imageio/stream/FileCacheImageInputStream.java:
+	Resynced with GNU Classpath.
+
+	2004-10-20  Michael Koch  <konqueror at gmx.de>
+
+        * javax/imageio/ImageWriter.java
+        (convertImageMetadata): New abstract method.
+        (convertStreamMetadata): Likewise.
+        (write): Likewise.
+        * javax/imageio/stream/FileCacheImageInputStream.java
+        (close): Fixed setting of stream to null.
+        (checkStreamClosed): Throws IOException.
+
+2004-10-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/rmi/rmic/RMIC.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/javax/imageio/ImageWriter.java
diff -u kaffe/libraries/javalib/javax/imageio/ImageWriter.java:1.2 kaffe/libraries/javalib/javax/imageio/ImageWriter.java:1.3
--- kaffe/libraries/javalib/javax/imageio/ImageWriter.java:1.2	Tue Oct  5 22:11:20 2004
+++ kaffe/libraries/javalib/javax/imageio/ImageWriter.java	Sat Oct 23 13:54:30 2004
@@ -164,6 +164,13 @@
     aborted = false;
   }
   
+  public abstract IIOMetadata convertImageMetadata (IIOMetadata inData,
+		                                    ImageTypeSpecifier imageType,
+				                    ImageWriteParam param);
+
+  public abstract IIOMetadata convertStreamMetadata (IIOMetadata inData,
+					             ImageWriteParam param);
+
   public void dispose()
   {
     // The default implementation is empty. Subclasses have to overwrite it.
@@ -376,4 +383,7 @@
 
     this.output = output;
   }
+
+  public abstract void write (IIOMetadata streamMetadata, IIOImage image, ImageWriteParam param)
+    throws IOException;
 }