Index: javax/imageio/ImageWriter.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/imageio/ImageWriter.java,v retrieving revision 1.3 diff -u -r1.3 ImageWriter.java --- javax/imageio/ImageWriter.java 5 Oct 2004 10:27:03 -0000 1.3 +++ javax/imageio/ImageWriter.java 20 Oct 2004 09:20:00 -0000 @@ -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; } Index: javax/imageio/stream/FileCacheImageInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/imageio/stream/FileCacheImageInputStream.java,v retrieving revision 1.1 diff -u -r1.1 FileCacheImageInputStream.java --- javax/imageio/stream/FileCacheImageInputStream.java 20 Oct 2004 08:40:25 -0000 1.1 +++ javax/imageio/stream/FileCacheImageInputStream.java 20 Oct 2004 09:20:00 -0000 @@ -65,11 +65,12 @@ if (stream != null) { stream.close(); - stream == null; + stream = null; } } private void checkStreamClosed() + throws IOException { if (stream == null) throw new IOException("stream closed");