gcc/libjava/javax/imageio/stream/ImageInputStreamImpl.java

516 lines
10 KiB
Java
Raw Normal View History

[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
/* ImageInputStream.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package javax.imageio.stream;
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
import java.io.DataInputStream;
import java.io.EOFException;
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
import java.io.IOException;
import java.nio.ByteOrder;
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
import java.util.Stack;
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
/**
* @author Michael Koch (konqueror@gmx.de)
*/
public abstract class ImageInputStreamImpl implements ImageInputStream
{
private boolean closed;
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
private Stack markStack = new Stack();
byte[] buffer = new byte[8];
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
protected int bitOffset;
protected ByteOrder byteOrder;
protected long flushedPos;
protected long streamPos;
public ImageInputStreamImpl()
{
// Do nothing here.
}
StackTraceElement.java: Made final. 2004-11-18 Jeroen Frijters <address@bogus.example.com> * java/lang/StackTraceElement.java: Made final. * java/nio/channels/Channels.java: Added private constructor. * java/rmi/Naming.java: Added private constructor. * java/rmi/registry/LocateRegistry.java: Added private constructor. * java/rmi/server/RMIClassLoader.java: Added private constructor. * java/security/KeyPairGeneratorSpi.java (clone): Made protected and simplified implementation. * java/text/DateFormat.java (allFields): Made package accessible. * java/text/DecimalFormat.java (formatInternal): Made private. * java/text/Format.java (formatInternal): Made private. * java/util/logging/Handler.java: Made constructor protected. * java/util/regex/Matcher.java: Made final. * java/util/regex/Pattern.java: Made final. * javax/crypto/CipherInputStream.java (mark): Corrected mark parameter type (from long to int). * javax/crypto/ExemptionMechanism.java (finalize): Added. * javax/crypto/Mac.java (getMacLength): Made final. (clone): Made final. * javax/imageio/ImageIO.java: Added private constructor. * javax/imageio/stream/ImageInputStreamImpl.java (checkClosed): Made final. * javax/net/ssl/SSLPermission.java: Made final. * javax/print/DocFlavor.java (hostEncoding): Added work-around to prevent the field from being a compile time constant. * javax/print/attribute/AttributeSetUtilities.java: Added private constructor. (UnmodifiableDocAttributeSet): Made private. (UnmodifiablePrintJobAttributeSet): Made private. (UnmodifiablePrintRequestAttributeSet): Made private. (UnmodifiablePrintServiceAttributeSet): Made private. (SynchronizedAttributeSet): Made private. (SynchronizedDocAttributeSet): Made private. (SynchronizedPrintJobAttributeSet): Made private. (SynchronizedPrintRequestAttributeSet): Made private. (SynchronizedPrintServiceAttributeSet): Made private. * javax/security/auth/PrivateCredentialPermission.java: Made final. From-SVN: r90866
2004-11-18 15:26:45 +00:00
protected final void checkClosed()
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
throws IOException
{
if (closed)
throw new IOException("stream closed");
}
public void close()
throws IOException
{
checkClosed();
closed = true;
}
protected void finalize()
throws Throwable
{
close();
}
public void flush()
throws IOException
{
flushBefore(getStreamPosition());
}
public void flushBefore(long position)
throws IOException
{
if (position < flushedPos)
throw new IndexOutOfBoundsException();
if (position > streamPos)
throw new IndexOutOfBoundsException();
flushedPos = position;
}
public int getBitOffset()
throws IOException
{
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
checkClosed();
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
return bitOffset;
}
public ByteOrder getByteOrder()
{
return byteOrder;
}
public long getFlushedPosition()
{
return flushedPos;
}
public long getStreamPosition()
throws IOException
{
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
checkClosed();
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
return streamPos;
}
public boolean isCached()
{
return false;
}
public boolean isCachedFile()
{
return false;
}
public boolean isCachedMemory()
{
return false;
}
public long length()
{
return -1L;
}
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
public void mark()
{
try
{
markStack.push(new Long(getStreamPosition()));
}
catch (IOException e)
{
// Ignored.
}
}
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
public abstract int read()
throws IOException;
public int read(byte[] data)
throws IOException
{
return read(data, 0, data.length);
}
public abstract int read(byte[] data, int offset, int len)
throws IOException;
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
public int readBit()
throws IOException
{
checkClosed();
// Calc new bit offset here, readByte resets it.
int newOffset = (bitOffset + 1) & 0x7;
byte data = readByte();
if (bitOffset != 0)
{
seek(getStreamPosition() - 1);
data = (byte) (data >> (8 - newOffset));
}
bitOffset = newOffset;
return data & 0x1;
}
public long readBits(int numBits)
throws IOException
{
checkClosed();
if (numBits < 0 || numBits > 64)
throw new IllegalArgumentException();
if (numBits == 0)
return 0L;
long bits = 0L;
for (int i = 0; i < numBits; i++)
{
bits <<= 1;
bits |= readBit();
}
return bits;
}
public boolean readBoolean()
throws IOException
{
byte data = readByte();
return data != 0;
}
public byte readByte()
throws IOException
{
int data = read();
if (data == -1)
throw new EOFException();
return (byte) data;
}
public void readBytes(IIOByteBuffer buffer, int len)
throws IOException
{
int result = read(buffer.getData(), buffer.getOffset(), len);
if (result == -1 || result < len)
throw new EOFException();
buffer.setLength(len);
}
public char readChar()
throws IOException
{
return (char) readShort();
}
public double readDouble()
throws IOException
{
return (double) readLong();
}
public float readFloat()
throws IOException
{
return (float) readInt();
}
public void readFully(byte[] data)
throws IOException
{
readFully(data, 0, data.length);
}
public void readFully(byte[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readByte();
}
public void readFully(char[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readChar();
}
public void readFully(double[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readDouble();
}
public void readFully(float[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readFloat();
}
public void readFully(int[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readInt();
}
public void readFully(long[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readLong();
}
public void readFully(short[] data, int offset, int len)
throws IOException
{
for (int i = 0; i < len; ++i)
data[offset + i] = readShort();
}
public int readInt()
throws IOException
{
int result = read(buffer, 0, 4);
if (result == -1)
throw new EOFException();
if (getByteOrder() == ByteOrder.LITTLE_ENDIAN)
{
return ((buffer[0] & 0xff)
+ (buffer[1] << 8)
+ (buffer[2] << 16)
+ (buffer[3] << 24));
}
return ((buffer[4] << 24)
+ (buffer[3] << 16)
+ (buffer[2] << 8)
+ (buffer[1] & 0xff));
}
public String readLine()
throws IOException
{
checkClosed();
int c = -1;
boolean eol = false;
StringBuffer buffer = new StringBuffer();
while (!eol && (c = read()) != -1)
{
switch(c)
{
case '\r':
// Consume following \n'
long oldPosition = getStreamPosition();
if (read() != '\n')
seek(oldPosition);
case '\n':
eol = true;
break;
default:
buffer.append((char) c);
break;
}
}
if (c == -1 && buffer.length() == 0)
return null;
return buffer.toString();
}
public long readLong()
throws IOException
{
int result = read(buffer, 0, 8);
if (result == -1)
throw new EOFException();
if (getByteOrder() == ByteOrder.LITTLE_ENDIAN)
{
return ((buffer[0] & 0xff)
+ (((buffer[1] & 0xff)) << 8)
+ (((buffer[2] & 0xff)) << 16)
+ (((buffer[3] & 0xffL)) << 24)
+ (((buffer[4] & 0xffL)) << 32)
+ (((buffer[5] & 0xffL)) << 40)
+ (((buffer[6] & 0xffL)) << 48)
+ (((long) buffer[7]) << 56));
}
return ((((long) buffer[7]) << 56)
+ ((buffer[6] & 0xffL) << 48)
+ ((buffer[5] & 0xffL) << 40)
+ ((buffer[4] & 0xffL) << 32)
+ ((buffer[3] & 0xffL) << 24)
+ ((buffer[2] & 0xff) << 16)
+ ((buffer[1] & 0xff) << 8)
+ (buffer[0] & 0xff));
}
public short readShort()
throws IOException
{
int result = read(buffer, 0, 2);
if (result == -1)
throw new EOFException();
if (getByteOrder() == ByteOrder.LITTLE_ENDIAN)
{
return (short) ((buffer[0] & 0xff)
+ (buffer[1] << 8));
}
return (short) ((buffer[0] << 8)
+ (buffer[1] & 0xff));
}
public int readUnsignedByte()
throws IOException
{
return readByte() & 0xff;
}
public long readUnsignedInt()
throws IOException
{
return readInt() & 0xffffffff;
}
public int readUnsignedShort()
throws IOException
{
return readShort() & 0xffff;
}
public String readUTF()
throws IOException
{
checkClosed();
String data;
ByteOrder old = getByteOrder();
setByteOrder(ByteOrder.BIG_ENDIAN); // Strings are always big endian.
try
{
data = DataInputStream.readUTF(this);
}
finally
{
setByteOrder(old);
}
return data;
}
public void reset()
throws IOException
{
checkClosed();
long mark = ((Long) markStack.pop()).longValue();
seek(mark);
}
public void seek(long position)
throws IOException
{
checkClosed();
if (position < getFlushedPosition())
throw new IndexOutOfBoundsException("position < flushed position");
streamPos = position;
bitOffset = 0;
}
public void setBitOffset (int bitOffset)
throws IOException
{
checkClosed();
if (bitOffset < 0 || bitOffset > 7)
throw new IllegalArgumentException();
this.bitOffset = bitOffset;
}
public void setByteOrder(ByteOrder byteOrder)
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
{
this.byteOrder = byteOrder;
}
[multiple changes] 2005-02-06 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files 2005-02-06 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java (IIOInvalidTreeException): Reformatted. * javax/imageio/spi/IIORegistry.java (static): Register ImageReaderSpi.class and ImageWriterSpi.class. * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileImageOutputStream.java: Implemented. 2004-02-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: Added all missing methods in javax.imageio.stream. From-SVN: r94698
2005-02-07 13:22:36 +00:00
public int skipBytes(int num)
throws IOException
{
checkClosed();
seek(getStreamPosition() + num);
bitOffset = 0;
return num;
}
public long skipBytes(long num)
throws IOException
{
checkClosed();
seek(getStreamPosition() + num);
bitOffset = 0;
return num;
}
[multiple changes] 2004-11-06 Mark Wielaard <mark@klomp.org> * Makefile.am: Add new javax.imageio files. * Makefile.in: Regenerated. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java: Import cleanup. * javax/imageio/metadata/package.html: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageReaderSpi.java (isOwnReader): New method. * javax/imageio/spi/ImageWriterSpi.java (isOwnWriter): Likewise. 2004-11-06 Michael Koch <konqueror@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-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New stub files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: Added much new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageWriterSpi.java: Add SOME new methods. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageReader.java, javax/imageio/ImageWriter.java: Mostly implemented. * javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java: New files. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadataFormat.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageTypeSpecifier.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/metadata/IIOMetadata.java: Mostly implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOImage.java, javax/imageio/ImageReadParam.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java: New files. * javax/imageio/stream/ImageOutputStream.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/metadata/IIOMetadata.java: New files. * javax/imageio/ImageTranscoder.java: Implemented. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java: Reworked import startments. * javax/imageio/spi/ServiceRegistry.java: Reworked import startments. Fixed XHTML in javadocs. (ServiceRegistry): Added @param tag to javadoc. * javax/imageio/stream/ImageInputStream.java (mark): Doesn't throws IOException; 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageIO.java: New file. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java (static): Don't register ImageReaderSpi.class and ImageWriterSpi.class yet. 2004-11-06 Michael Koch <konqueror@gmx.de> * javax/imageio/spi/IIORegistry.java: New file. From-SVN: r90181
2004-11-06 18:09:00 +00:00
}