obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

59 files changed, 3733 insertions, 0 deletions

diff --git a/libjava/gnu/javax/imageio/IIOInputStream.h b/libjava/gnu/javax/imageio/IIOInputStream.h
new file mode 100644
index 000000000..2f0cbbdd0
--- /dev/null
+++ b/libjava/gnu/javax/imageio/IIOInputStream.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_IIOInputStream__
+#define __gnu_javax_imageio_IIOInputStream__
+
+#pragma interface
+
+#include <java/io/InputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+          class IIOInputStream;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::IIOInputStream : public ::java::io::InputStream
+{
+
+public:
+  IIOInputStream(::javax::imageio::stream::ImageInputStream *);
+  virtual jint available();
+  virtual void close();
+  virtual void mark(jint);
+  virtual jboolean markSupported();
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *);
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual void reset();
+  virtual jlong skip(jlong);
+private:
+  ::javax::imageio::stream::ImageInputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) is;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_IIOInputStream__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPDecoder.h b/libjava/gnu/javax/imageio/bmp/BMPDecoder.h
new file mode 100644
index 000000000..34c486a43
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPDecoder.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPDecoder__
+#define __gnu_javax_imageio_bmp_BMPDecoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPDecoder;
+            class BMPFileHeader;
+            class BMPInfoHeader;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+          class IndexColorModel;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPDecoder : public ::java::lang::Object
+{
+
+public:
+  BMPDecoder(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  static ::gnu::javax::imageio::bmp::BMPDecoder * getDecoder(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *) = 0;
+public: // actually protected
+  virtual JArray< jint > * readBitMasks(::javax::imageio::stream::ImageInputStream *);
+  virtual ::java::awt::image::IndexColorModel * readPalette(::javax::imageio::stream::ImageInputStream *);
+  virtual void skipToImage(::javax::imageio::stream::ImageInputStream *);
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPDecoder__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPEncoder.h b/libjava/gnu/javax/imageio/bmp/BMPEncoder.h
new file mode 100644
index 000000000..db60ff865
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPEncoder.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPEncoder__
+#define __gnu_javax_imageio_bmp_BMPEncoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPEncoder;
+            class BMPFileHeader;
+            class BMPInfoHeader;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPEncoder : public ::java::lang::Object
+{
+
+public:
+  BMPEncoder();
+  static ::gnu::javax::imageio::bmp::BMPEncoder * getEncoder(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPEncoder__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPException.h b/libjava/gnu/javax/imageio/bmp/BMPException.h
new file mode 100644
index 000000000..9a51c41ad
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPException__
+#define __gnu_javax_imageio_bmp_BMPException__
+
+#pragma interface
+
+#include <javax/imageio/IIOException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPException : public ::javax::imageio::IIOException
+{
+
+public:
+  BMPException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPException__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPFileHeader.h b/libjava/gnu/javax/imageio/bmp/BMPFileHeader.h
new file mode 100644
index 000000000..1fe5d3f0e
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPFileHeader.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPFileHeader__
+#define __gnu_javax_imageio_bmp_BMPFileHeader__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+      namespace stream
+      {
+          class ImageInputStream;
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPFileHeader : public ::java::lang::Object
+{
+
+public:
+  BMPFileHeader(::javax::imageio::stream::ImageInputStream *);
+  BMPFileHeader(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::IIOImage *);
+  virtual void write(::javax::imageio::stream::ImageOutputStream *);
+  virtual void setSize(jlong);
+  virtual void setOffset(jlong);
+  virtual jlong getSize();
+  virtual jlong getOffset();
+private:
+  static const jshort bfType = 16973;
+public: // actually protected
+  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) bfSize;
+  jlong bfOffBits;
+public:
+  static const jint SIZE = 14;
+private:
+  static const jint BITMAPINFOHEADER_SIZE = 40;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPFileHeader__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageReader.h b/libjava/gnu/javax/imageio/bmp/BMPImageReader.h
new file mode 100644
index 000000000..972124e67
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPImageReader.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPImageReader__
+#define __gnu_javax_imageio_bmp_BMPImageReader__
+
+#pragma interface
+
+#include <javax/imageio/ImageReader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPDecoder;
+            class BMPFileHeader;
+            class BMPImageReader;
+            class BMPInfoHeader;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReadParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace spi
+      {
+          class ImageReaderSpi;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPImageReader : public ::javax::imageio::ImageReader
+{
+
+public: // actually protected
+  BMPImageReader(::javax::imageio::spi::ImageReaderSpi *);
+private:
+  void validateIndex(jint);
+public:
+  virtual void setInput(::java::lang::Object *);
+  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
+  virtual void setInput(::java::lang::Object *, jboolean);
+private:
+  void checkStream();
+  void readHeaders();
+public:
+  virtual jint getWidth(jint);
+  virtual jint getHeight(jint);
+  virtual ::java::util::Iterator * getImageTypes(jint);
+  virtual jint getNumImages(jboolean);
+  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
+  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
+  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
+private:
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  ::gnu::javax::imageio::bmp::BMPDecoder * decoder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPImageReader__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageReaderSpi.h b/libjava/gnu/javax/imageio/bmp/BMPImageReaderSpi.h
new file mode 100644
index 000000000..f7ac3a4d6
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPImageReaderSpi.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPImageReaderSpi__
+#define __gnu_javax_imageio_bmp_BMPImageReaderSpi__
+
+#pragma interface
+
+#include <javax/imageio/spi/ImageReaderSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPImageReaderSpi;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReader;
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
+{
+
+public:
+  BMPImageReaderSpi();
+  virtual ::java::lang::String * getDescription(::java::util::Locale *);
+  virtual jboolean canDecodeInput(::java::lang::Object *);
+  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
+public: // actually package-private
+  static ::java::lang::String * vendorName;
+  static ::java::lang::String * version;
+  static ::java::lang::String * readerClassName;
+  static JArray< ::java::lang::String * > * names;
+  static JArray< ::java::lang::String * > * suffixes;
+  static JArray< ::java::lang::String * > * MIMETypes;
+  static JArray< ::java::lang::String * > * writerSpiNames;
+  static const jboolean supportsStandardStreamMetadataFormat = 0;
+  static ::java::lang::String * nativeStreamMetadataFormatName;
+  static ::java::lang::String * nativeStreamMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
+  static const jboolean supportsStandardImageMetadataFormat = 0;
+  static ::java::lang::String * nativeImageMetadataFormatName;
+  static ::java::lang::String * nativeImageMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageWriter.h b/libjava/gnu/javax/imageio/bmp/BMPImageWriter.h
new file mode 100644
index 000000000..1fb9795af
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPImageWriter.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPImageWriter__
+#define __gnu_javax_imageio_bmp_BMPImageWriter__
+
+#pragma interface
+
+#include <javax/imageio/ImageWriter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPEncoder;
+            class BMPFileHeader;
+            class BMPImageWriter;
+            class BMPInfoHeader;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageTypeSpecifier;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace spi
+      {
+          class ImageWriterSpi;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPImageWriter : public ::javax::imageio::ImageWriter
+{
+
+public: // actually protected
+  BMPImageWriter(::javax::imageio::spi::ImageWriterSpi *);
+public:
+  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
+  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *);
+  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultImageMetadata(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *);
+  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultStreamMetadata(::javax::imageio::ImageWriteParam *);
+  virtual void write(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+private:
+  void checkStream();
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPEncoder * __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriter)))) encoder;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * infoHeader;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPImageWriter__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPImageWriterSpi.h b/libjava/gnu/javax/imageio/bmp/BMPImageWriterSpi.h
new file mode 100644
index 000000000..76ca4b07d
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPImageWriterSpi.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPImageWriterSpi__
+#define __gnu_javax_imageio_bmp_BMPImageWriterSpi__
+
+#pragma interface
+
+#include <javax/imageio/spi/ImageWriterSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPImageWriter;
+            class BMPImageWriterSpi;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageTypeSpecifier;
+        class ImageWriter;
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPImageWriterSpi : public ::javax::imageio::spi::ImageWriterSpi
+{
+
+public:
+  BMPImageWriterSpi();
+  virtual jboolean canEncodeImage(::javax::imageio::ImageTypeSpecifier *);
+  virtual ::javax::imageio::ImageWriter * createWriterInstance(::java::lang::Object *);
+  virtual ::gnu::javax::imageio::bmp::BMPImageWriter * getWriterInstance();
+  virtual ::java::lang::String * getDescription(::java::util::Locale *);
+public: // actually package-private
+  static ::java::lang::String * vendorName;
+  static ::java::lang::String * version;
+  static ::java::lang::String * writerClassName;
+  static JArray< ::java::lang::String * > * names;
+  static JArray< ::java::lang::String * > * suffixes;
+  static JArray< ::java::lang::String * > * MIMETypes;
+  static JArray< ::java::lang::String * > * readerSpiNames;
+  static const jboolean supportsStandardStreamMetadataFormat = 0;
+  static ::java::lang::String * nativeStreamMetadataFormatName;
+  static ::java::lang::String * nativeStreamMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
+  static const jboolean supportsStandardImageMetadataFormat = 0;
+  static ::java::lang::String * nativeImageMetadataFormatName;
+  static ::java::lang::String * nativeImageMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
+private:
+  ::gnu::javax::imageio::bmp::BMPImageWriter * __attribute__((aligned(__alignof__( ::javax::imageio::spi::ImageWriterSpi)))) writerInstance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPImageWriterSpi__
diff --git a/libjava/gnu/javax/imageio/bmp/BMPInfoHeader.h b/libjava/gnu/javax/imageio/bmp/BMPInfoHeader.h
new file mode 100644
index 000000000..d47843f60
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/BMPInfoHeader.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_BMPInfoHeader__
+#define __gnu_javax_imageio_bmp_BMPInfoHeader__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPInfoHeader;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace stream
+      {
+          class ImageInputStream;
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::BMPInfoHeader : public ::java::lang::Object
+{
+
+public:
+  BMPInfoHeader(::javax::imageio::stream::ImageInputStream *);
+  BMPInfoHeader(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+private:
+  JArray< jbyte > * intToWord(jint);
+  JArray< jbyte > * intToDWord(jint);
+public:
+  virtual void setBitCount(jshort);
+  virtual jshort getBitCount();
+  virtual void setCompression(jint);
+  virtual jint getNumberOfPaletteEntries();
+  virtual jint getCompression();
+  virtual ::java::awt::Dimension * getSize();
+  virtual jint getWidth();
+  virtual jint getHeight();
+  virtual void setSize(::java::awt::Dimension *);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) biSize;
+  jint biWidth;
+  jint biHeight;
+  jshort biPlanes;
+  jshort biBitCount;
+  jint biCompression;
+  jint biSizeImage;
+  jint biXPelsPerMeter;
+  jint biYPelsPerMeter;
+  jint biClrUsed;
+  jint biClrImportant;
+public:
+  static const jint SIZE = 40;
+  static const jint BI_RGB = 0;
+  static const jint BI_RLE8 = 1;
+  static const jint BI_RLE4 = 2;
+  static const jint BI_BITFIELDS = 3;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_BMPInfoHeader__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeBF16.h b/libjava/gnu/javax/imageio/bmp/DecodeBF16.h
new file mode 100644
index 000000000..3051f0bcc
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeBF16.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeBF16__
+#define __gnu_javax_imageio_bmp_DecodeBF16__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeBF16;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeBF16 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeBF16(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *, jboolean);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+private:
+  JArray< jint > * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPDecoder)))) bitmasks;
+  jboolean useDefaultMasks;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeBF16__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeBF32.h b/libjava/gnu/javax/imageio/bmp/DecodeBF32.h
new file mode 100644
index 000000000..ac4f03507
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeBF32.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeBF32__
+#define __gnu_javax_imageio_bmp_DecodeBF32__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeBF32;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeBF32 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeBF32(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *, jboolean);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+private:
+  JArray< jint > * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPDecoder)))) bitmasks;
+  jboolean useDefaultMasks;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeBF32__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB1.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB1.h
new file mode 100644
index 000000000..ec4acf80f
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeRGB1.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeRGB1__
+#define __gnu_javax_imageio_bmp_DecodeRGB1__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeRGB1;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeRGB1 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeRGB1(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeRGB1__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB24.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB24.h
new file mode 100644
index 000000000..da0e4dff1
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeRGB24.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeRGB24__
+#define __gnu_javax_imageio_bmp_DecodeRGB24__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeRGB24;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeRGB24 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeRGB24(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeRGB24__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB4.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB4.h
new file mode 100644
index 000000000..d0b7e08ca
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeRGB4.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeRGB4__
+#define __gnu_javax_imageio_bmp_DecodeRGB4__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeRGB4;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeRGB4 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeRGB4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeRGB4__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRGB8.h b/libjava/gnu/javax/imageio/bmp/DecodeRGB8.h
new file mode 100644
index 000000000..e8a6300fb
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeRGB8.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeRGB8__
+#define __gnu_javax_imageio_bmp_DecodeRGB8__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeRGB8;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeRGB8 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeRGB8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeRGB8__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRLE4.h b/libjava/gnu/javax/imageio/bmp/DecodeRLE4.h
new file mode 100644
index 000000000..f70a21bfa
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeRLE4.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeRLE4__
+#define __gnu_javax_imageio_bmp_DecodeRLE4__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeRLE4;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeRLE4 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeRLE4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+private:
+  JArray< jbyte > * uncompress(jint, jint, ::javax::imageio::stream::ImageInputStream *);
+  static const jbyte ESCAPE = 0;
+  static const jbyte EOL = 0;
+  static const jbyte EOB = 1;
+  static const jbyte DELTA = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeRLE4__
diff --git a/libjava/gnu/javax/imageio/bmp/DecodeRLE8.h b/libjava/gnu/javax/imageio/bmp/DecodeRLE8.h
new file mode 100644
index 000000000..bb23187c3
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/DecodeRLE8.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_DecodeRLE8__
+#define __gnu_javax_imageio_bmp_DecodeRLE8__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPDecoder.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class DecodeRLE8;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::DecodeRLE8 : public ::gnu::javax::imageio::bmp::BMPDecoder
+{
+
+public:
+  DecodeRLE8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual ::java::awt::image::BufferedImage * decode(::javax::imageio::stream::ImageInputStream *);
+private:
+  JArray< jbyte > * uncompress(jint, jint, ::javax::imageio::stream::ImageInputStream *);
+  static const jbyte ESCAPE = 0;
+  static const jbyte EOL = 0;
+  static const jbyte EOB = 1;
+  static const jbyte DELTA = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_DecodeRLE8__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB1.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB1.h
new file mode 100644
index 000000000..55f4f8296
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRGB1.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRGB1__
+#define __gnu_javax_imageio_bmp_EncodeRGB1__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRGB1;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRGB1 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRGB1(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRGB1__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB16.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB16.h
new file mode 100644
index 000000000..ff3d78247
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRGB16.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRGB16__
+#define __gnu_javax_imageio_bmp_EncodeRGB16__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRGB16;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRGB16 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRGB16(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRGB16__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB24.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB24.h
new file mode 100644
index 000000000..a40226c10
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRGB24.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRGB24__
+#define __gnu_javax_imageio_bmp_EncodeRGB24__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRGB24;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRGB24 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRGB24(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRGB24__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB32.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB32.h
new file mode 100644
index 000000000..7d170f73f
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRGB32.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRGB32__
+#define __gnu_javax_imageio_bmp_EncodeRGB32__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRGB32;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRGB32 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRGB32(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRGB32__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB4.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB4.h
new file mode 100644
index 000000000..15fe12432
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRGB4.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRGB4__
+#define __gnu_javax_imageio_bmp_EncodeRGB4__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRGB4;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRGB4 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRGB4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRGB4__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRGB8.h b/libjava/gnu/javax/imageio/bmp/EncodeRGB8.h
new file mode 100644
index 000000000..f01e35f76
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRGB8.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRGB8__
+#define __gnu_javax_imageio_bmp_EncodeRGB8__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRGB8;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRGB8 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRGB8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRGB8__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRLE4.h b/libjava/gnu/javax/imageio/bmp/EncodeRLE4.h
new file mode 100644
index 000000000..3b9c0f7d0
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRLE4.h
@@ -0,0 +1,75 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRLE4__
+#define __gnu_javax_imageio_bmp_EncodeRLE4__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRLE4;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRLE4 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRLE4(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+private:
+  JArray< jbyte > * uncompress(jint, jint, ::java::nio::ByteBuffer *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+private:
+  static const jbyte ESCAPE = 0;
+  static const jbyte EOL = 0;
+  static const jbyte EOB = 1;
+  static const jbyte DELTA = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRLE4__
diff --git a/libjava/gnu/javax/imageio/bmp/EncodeRLE8.h b/libjava/gnu/javax/imageio/bmp/EncodeRLE8.h
new file mode 100644
index 000000000..d6e6e450f
--- /dev/null
+++ b/libjava/gnu/javax/imageio/bmp/EncodeRLE8.h
@@ -0,0 +1,75 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_bmp_EncodeRLE8__
+#define __gnu_javax_imageio_bmp_EncodeRLE8__
+
+#pragma interface
+
+#include <gnu/javax/imageio/bmp/BMPEncoder.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace bmp
+        {
+            class BMPFileHeader;
+            class BMPInfoHeader;
+            class EncodeRLE8;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class IIOImage;
+        class ImageWriteParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace stream
+      {
+          class ImageOutputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::bmp::EncodeRLE8 : public ::gnu::javax::imageio::bmp::BMPEncoder
+{
+
+public:
+  EncodeRLE8(::gnu::javax::imageio::bmp::BMPFileHeader *, ::gnu::javax::imageio::bmp::BMPInfoHeader *);
+  virtual void encode(::javax::imageio::stream::ImageOutputStream *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
+private:
+  JArray< jbyte > * uncompress(jint, jint, ::java::nio::ByteBuffer *);
+public: // actually protected
+  ::gnu::javax::imageio::bmp::BMPInfoHeader * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::bmp::BMPEncoder)))) infoHeader;
+  ::gnu::javax::imageio::bmp::BMPFileHeader * fileHeader;
+  jlong offset;
+private:
+  static const jbyte ESCAPE = 0;
+  static const jbyte EOL = 0;
+  static const jbyte EOB = 1;
+  static const jbyte DELTA = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_bmp_EncodeRLE8__
diff --git a/libjava/gnu/javax/imageio/gif/GIFFile$GIFException.h b/libjava/gnu/javax/imageio/gif/GIFFile$GIFException.h
new file mode 100644
index 000000000..d4468b958
--- /dev/null
+++ b/libjava/gnu/javax/imageio/gif/GIFFile$GIFException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_gif_GIFFile$GIFException__
+#define __gnu_javax_imageio_gif_GIFFile$GIFException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace gif
+        {
+            class GIFFile$GIFException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::gif::GIFFile$GIFException : public ::java::lang::Exception
+{
+
+public:
+  GIFFile$GIFException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_gif_GIFFile$GIFException__
diff --git a/libjava/gnu/javax/imageio/gif/GIFFile.h b/libjava/gnu/javax/imageio/gif/GIFFile.h
new file mode 100644
index 000000000..b574276fd
--- /dev/null
+++ b/libjava/gnu/javax/imageio/gif/GIFFile.h
@@ -0,0 +1,101 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_gif_GIFFile__
+#define __gnu_javax_imageio_gif_GIFFile__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace gif
+        {
+            class GIFFile;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::gif::GIFFile : public ::java::lang::Object
+{
+
+public:
+  GIFFile(::java::io::InputStream *);
+private:
+  GIFFile(::gnu::javax::imageio::gif::GIFFile *, ::java::io::InputStream *, jint);
+public:
+  static jboolean readSignature(::java::io::InputStream *);
+private:
+  void loadImage(::java::io::InputStream *);
+  void packPixels();
+public:
+  virtual jint getWidth();
+  virtual jint getHeight();
+  virtual jint getNColors();
+  virtual jboolean hasTransparency();
+  virtual jint getTransparentIndex();
+  virtual ::java::lang::String * getComment();
+  virtual jint getDuration();
+private:
+  void deinterlace();
+  void readLocal(::java::io::InputStream *);
+public:
+  virtual JArray< jbyte > * getRawPalette();
+  virtual ::gnu::javax::imageio::gif::GIFFile * getImage(jint);
+  virtual JArray< jbyte > * getRawImage();
+  virtual jint nImages();
+private:
+  void readExtension(::java::io::InputStream *);
+  JArray< jbyte > * readData(::java::io::InputStream *);
+  void decodeRaster(::java::io::InputStream *);
+  jint getBits(jint);
+  static JArray< jbyte > * nsBlock;
+  static const jint EXTENSION = 33;
+  static const jint LOCAL = 44;
+  static const jint TERMINATOR = 59;
+  static const jint EXTENSION_COMMENT = 254;
+  static const jint EXTENSION_GCONTROL = 249;
+  static const jint EXTENSION_APPLICATION = 255;
+  static const jint UNDRAW_OVERWRITE = 1;
+  static const jint UNDRAW_RESTORE_BACKGROUND = 2;
+  static const jint UNDRAW_RESTORE_PREVIOUS = 3;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
+  jint y;
+  jint width;
+  jint height;
+  jint globalWidth;
+  jint globalHeight;
+  jbyte bgIndex;
+  jint nColors;
+  JArray< jbyte > * globalPalette;
+  jboolean hasGlobalColorMap;
+  JArray< jbyte > * localPalette;
+  jboolean interlaced;
+  jboolean hasTransparency__;
+  jint undraw;
+  jint transparentIndex;
+  JArray< jbyte > * raster;
+  JArray< jbyte > * compressedData;
+  jint duration;
+  jint dataBlockIndex;
+  ::java::lang::String * comment;
+  jint remainingBits;
+  jint currentBits;
+  jboolean isLooped;
+  jint loops;
+  ::java::util::Vector * animationFrames;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_gif_GIFFile__
diff --git a/libjava/gnu/javax/imageio/gif/GIFImageReader.h b/libjava/gnu/javax/imageio/gif/GIFImageReader.h
new file mode 100644
index 000000000..4fc8c7b93
--- /dev/null
+++ b/libjava/gnu/javax/imageio/gif/GIFImageReader.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_gif_GIFImageReader__
+#define __gnu_javax_imageio_gif_GIFImageReader__
+
+#pragma interface
+
+#include <javax/imageio/ImageReader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace gif
+        {
+            class GIFFile;
+            class GIFImageReader;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+          class IndexColorModel;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReadParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace spi
+      {
+          class ImageReaderSpi;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::gif::GIFImageReader : public ::javax::imageio::ImageReader
+{
+
+public: // actually protected
+  GIFImageReader(::javax::imageio::spi::ImageReaderSpi *);
+private:
+  void readImage();
+  ::java::awt::image::IndexColorModel * getPalette(jint);
+  void validateIndex(jint);
+public:
+  virtual void setInput(::java::lang::Object *);
+  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
+  virtual void setInput(::java::lang::Object *, jboolean);
+private:
+  void checkStream();
+public:
+  virtual jint getWidth(jint);
+  virtual jint getHeight(jint);
+  virtual ::java::util::Iterator * getImageTypes(jint);
+  virtual jint getNumImages(jboolean);
+  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
+  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
+  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
+private:
+  ::gnu::javax::imageio::gif::GIFFile * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) file;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_gif_GIFImageReader__
diff --git a/libjava/gnu/javax/imageio/gif/GIFImageReaderSpi.h b/libjava/gnu/javax/imageio/gif/GIFImageReaderSpi.h
new file mode 100644
index 000000000..027faea80
--- /dev/null
+++ b/libjava/gnu/javax/imageio/gif/GIFImageReaderSpi.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_gif_GIFImageReaderSpi__
+#define __gnu_javax_imageio_gif_GIFImageReaderSpi__
+
+#pragma interface
+
+#include <javax/imageio/spi/ImageReaderSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace gif
+        {
+            class GIFImageReaderSpi;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReader;
+    }
+  }
+}
+
+class gnu::javax::imageio::gif::GIFImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
+{
+
+public:
+  GIFImageReaderSpi();
+  virtual ::java::lang::String * getDescription(::java::util::Locale *);
+  virtual jboolean canDecodeInput(::java::lang::Object *);
+  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
+public: // actually package-private
+  static ::java::lang::String * vendorName;
+  static ::java::lang::String * version;
+  static ::java::lang::String * readerClassName;
+  static JArray< ::java::lang::String * > * names;
+  static JArray< ::java::lang::String * > * suffixes;
+  static JArray< ::java::lang::String * > * MIMETypes;
+  static JArray< ::java::lang::String * > * writerSpiNames;
+  static const jboolean supportsStandardStreamMetadataFormat = 0;
+  static ::java::lang::String * nativeStreamMetadataFormatName;
+  static ::java::lang::String * nativeStreamMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
+  static const jboolean supportsStandardImageMetadataFormat = 0;
+  static ::java::lang::String * nativeImageMetadataFormatName;
+  static ::java::lang::String * nativeImageMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_gif_GIFImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/jpeg/DCT.h b/libjava/gnu/javax/imageio/jpeg/DCT.h
new file mode 100644
index 000000000..16636be2d
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/DCT.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_DCT__
+#define __gnu_javax_imageio_jpeg_DCT__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class DCT;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::DCT : public ::java::lang::Object
+{
+
+public:
+  DCT();
+  static jdouble C(jint);
+private:
+  void initMatrix();
+public:
+  static JArray< JArray< jdouble > * > * slow_idct(JArray< JArray< jdouble > * > *);
+  static JArray< JArray< jfloat > * > * slow_fdct(JArray< JArray< jfloat > * > *);
+  virtual JArray< JArray< jfloat > * > * fast_fdct(JArray< JArray< jfloat > * > *);
+  virtual JArray< JArray< jdouble > * > * fast_idct(JArray< JArray< jdouble > * > *);
+  virtual JArray< JArray< jdouble > * > * idj_fast_fdct(JArray< JArray< jfloat > * > *);
+  JArray< JArray< jdouble > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) c;
+  JArray< JArray< jdouble > * > * cT;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_DCT__
diff --git a/libjava/gnu/javax/imageio/jpeg/HuffmanTable.h b/libjava/gnu/javax/imageio/jpeg/HuffmanTable.h
new file mode 100644
index 000000000..794b2624d
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/HuffmanTable.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_HuffmanTable__
+#define __gnu_javax_imageio_jpeg_HuffmanTable__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class HuffmanTable;
+            class JPEGImageInputStream;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace plugins
+      {
+        namespace jpeg
+        {
+            class JPEGHuffmanTable;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::HuffmanTable : public ::java::lang::Object
+{
+
+public:
+  HuffmanTable(::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
+private:
+  void generateSizeTable();
+  void generateCodeTable();
+  void generateDecoderTables();
+public:
+  virtual void orderCodes(jboolean);
+  static jint extend(jint, jint);
+  virtual jint decode(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
+  static const jint HUFFMAN_MAX_TABLES = 4;
+private:
+  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) huffcode;
+  JArray< jshort > * huffsize;
+  JArray< jshort > * EHUFCO;
+  JArray< jshort > * EHUFSI;
+  JArray< jshort > * valptr;
+  JArray< jshort > * mincode;
+  JArray< jshort > * maxcode;
+  JArray< jshort > * huffval;
+  JArray< jshort > * bits;
+public: // actually package-private
+  static jbyte JPEG_DC_TABLE;
+  static jbyte JPEG_AC_TABLE;
+private:
+  jshort lastk;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_HuffmanTable__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGComponent.h b/libjava/gnu/javax/imageio/jpeg/JPEGComponent.h
new file mode 100644
index 000000000..36ff5f647
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGComponent.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGComponent__
+#define __gnu_javax_imageio_jpeg_JPEGComponent__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class DCT;
+            class HuffmanTable;
+            class JPEGComponent;
+            class JPEGImageInputStream;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class WritableRaster;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace plugins
+      {
+        namespace jpeg
+        {
+            class JPEGHuffmanTable;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGComponent : public ::java::lang::Object
+{
+
+public:
+  JPEGComponent(jbyte, jbyte, jbyte, jbyte);
+  virtual void padMCU(jint, jint);
+  virtual void resetInterval();
+  virtual void quantitizeData();
+  virtual void setDCTable(::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
+  virtual void setACTable(::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
+  virtual void idctData(::gnu::javax::imageio::jpeg::DCT *);
+  virtual void scaleByFactors();
+  virtual void writeBlock(::java::awt::image::WritableRaster *, JArray< JArray< jdouble > * > *, jint, jint, jint);
+  virtual void writeData(::java::awt::image::WritableRaster *, jint);
+  virtual void setQuantizationTable(JArray< jint > *);
+  virtual void readComponentMCU(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
+  virtual jdouble decode_dc_coefficient(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
+  virtual JArray< jdouble > * decode_ac_coefficients(::gnu::javax::imageio::jpeg::JPEGImageInputStream *);
+  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) factorH;
+  jbyte factorV;
+  jbyte component_id;
+  jbyte quant_id;
+  jint width;
+  jint height;
+  jint maxV;
+  jint maxH;
+  ::gnu::javax::imageio::jpeg::HuffmanTable * ACTable;
+  ::gnu::javax::imageio::jpeg::HuffmanTable * DCTable;
+  JArray< jint > * quantizationTable;
+  jdouble previousDC;
+public: // actually package-private
+  ::java::util::ArrayList * data;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGComponent__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGDecoder.h b/libjava/gnu/javax/imageio/jpeg/JPEGDecoder.h
new file mode 100644
index 000000000..4eef890fe
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGDecoder.h
@@ -0,0 +1,99 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGDecoder__
+#define __gnu_javax_imageio_jpeg_JPEGDecoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGDecoder;
+            class JPEGImageInputStream;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace plugins
+      {
+        namespace jpeg
+        {
+            class JPEGHuffmanTable;
+            class JPEGQTable;
+        }
+      }
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGDecoder : public ::java::lang::Object
+{
+
+public:
+  virtual jint getHeight();
+  virtual jint getWidth();
+  JPEGDecoder(::javax::imageio::stream::ImageInputStream *);
+  virtual void decode();
+private:
+  void decodeJFIFExtension();
+public:
+  virtual ::java::awt::image::BufferedImage * getImage();
+public: // actually package-private
+  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) majorVersion;
+  jbyte minorVersion;
+  jbyte units;
+  jshort Xdensity;
+  jshort Ydensity;
+  jbyte Xthumbnail;
+  jbyte Ythumbnail;
+  JArray< jbyte > * thumbnail;
+  ::java::awt::image::BufferedImage * image;
+  jint width;
+  jint height;
+  jbyte marker;
+public:
+  static const jbyte MAJOR_VERSION = 1;
+  static const jbyte MINOR_VERSION = 2;
+  static const jshort JFIF_FIXED_LENGTH = 16;
+  static const jshort JFXX_FIXED_LENGTH = 8;
+private:
+  ::gnu::javax::imageio::jpeg::JPEGImageInputStream * jpegStream;
+public: // actually package-private
+  ::java::util::ArrayList * jpegFrames;
+  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * dcTables;
+  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * acTables;
+  JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * qTables;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGDecoder__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGException.h b/libjava/gnu/javax/imageio/jpeg/JPEGException.h
new file mode 100644
index 000000000..b2a9d5a65
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGException__
+#define __gnu_javax_imageio_jpeg_JPEGException__
+
+#pragma interface
+
+#include <javax/imageio/IIOException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGException : public ::javax::imageio::IIOException
+{
+
+public:
+  JPEGException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGException__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGFrame.h b/libjava/gnu/javax/imageio/jpeg/JPEGFrame.h
new file mode 100644
index 000000000..5aad0a200
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGFrame.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGFrame__
+#define __gnu_javax_imageio_jpeg_JPEGFrame__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGFrame;
+            class JPEGScan;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace plugins
+      {
+        namespace jpeg
+        {
+            class JPEGHuffmanTable;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGFrame : public ::java::lang::Object
+{
+
+public:
+  JPEGFrame();
+  virtual void addComponent(jbyte, jbyte, jbyte);
+  virtual void setPrecision(jbyte);
+  virtual void setScanLines(jshort);
+  virtual void setSamplesPerLine(jshort);
+  virtual void setColorMode(jbyte);
+  virtual void setComponentCount(jbyte);
+  virtual jbyte getComponentCount();
+  virtual void setHuffmanTables(jbyte, ::javax::imageio::plugins::jpeg::JPEGHuffmanTable *, ::javax::imageio::plugins::jpeg::JPEGHuffmanTable *);
+  static const jbyte JPEG_COLOR_GRAY = 1;
+  static const jbyte JPEG_COLOR_RGB = 2;
+  static const jbyte JPEG_COLOR_YCbCr = 3;
+  static const jbyte JPEG_COLOR_CMYK = 4;
+  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) precision;
+  jbyte colorMode;
+  jbyte componentCount;
+  jshort width;
+  jshort height;
+  ::gnu::javax::imageio::jpeg::JPEGScan * components;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGFrame__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGImageInputStream.h b/libjava/gnu/javax/imageio/jpeg/JPEGImageInputStream.h
new file mode 100644
index 000000000..19304c07d
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGImageInputStream.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGImageInputStream__
+#define __gnu_javax_imageio_jpeg_JPEGImageInputStream__
+
+#pragma interface
+
+#include <javax/imageio/stream/ImageInputStreamImpl.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGImageInputStream;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+      namespace stream
+      {
+          class ImageInputStream;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
+{
+
+public:
+  JPEGImageInputStream(::javax::imageio::stream::ImageInputStream *);
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+private:
+  jbyte pullByte();
+public:
+  virtual jbyte getMarker();
+  virtual jint readBit();
+  virtual jbyte findNextMarker();
+private:
+  ::javax::imageio::stream::ImageInputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) in;
+public: // actually package-private
+  jbyte marker;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGImageInputStream__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGImageReader.h b/libjava/gnu/javax/imageio/jpeg/JPEGImageReader.h
new file mode 100644
index 000000000..f7deeb840
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGImageReader.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGImageReader__
+#define __gnu_javax_imageio_jpeg_JPEGImageReader__
+
+#pragma interface
+
+#include <javax/imageio/ImageReader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGDecoder;
+            class JPEGImageReader;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReadParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+      namespace spi
+      {
+          class ImageReaderSpi;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGImageReader : public ::javax::imageio::ImageReader
+{
+
+public: // actually protected
+  JPEGImageReader(::javax::imageio::spi::ImageReaderSpi *);
+public:
+  virtual jint getHeight(jint);
+  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
+  virtual ::java::util::Iterator * getImageTypes(jint);
+  virtual jint getNumImages(jboolean);
+  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
+  virtual jint getWidth(jint);
+  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
+private:
+  void checkIndex(jint);
+  void checkStream();
+  void decodeStream();
+public: // actually package-private
+  ::gnu::javax::imageio::jpeg::JPEGDecoder * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) decoder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGImageReader__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.h b/libjava/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.h
new file mode 100644
index 000000000..6cb33fea0
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGImageReaderSpi__
+#define __gnu_javax_imageio_jpeg_JPEGImageReaderSpi__
+
+#pragma interface
+
+#include <javax/imageio/spi/ImageReaderSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGImageReaderSpi;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReader;
+      namespace spi
+      {
+          class IIORegistry;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
+{
+
+public:
+  JPEGImageReaderSpi();
+  virtual ::java::lang::String * getDescription(::java::util::Locale *);
+  virtual jboolean canDecodeInput(::java::lang::Object *);
+  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
+  static void registerSpis(::javax::imageio::spi::IIORegistry *);
+  static ::gnu::javax::imageio::jpeg::JPEGImageReaderSpi * getReaderSpi();
+public: // actually package-private
+  static ::java::lang::String * vendorName;
+  static ::java::lang::String * version;
+  static ::java::lang::String * readerClassName;
+  static JArray< ::java::lang::String * > * names;
+  static JArray< ::java::lang::String * > * suffixes;
+  static JArray< ::java::lang::String * > * MIMETypes;
+  static JArray< ::java::lang::String * > * writerSpiNames;
+  static const jboolean supportsStandardStreamMetadataFormat = 0;
+  static ::java::lang::String * nativeStreamMetadataFormatName;
+  static ::java::lang::String * nativeStreamMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
+  static const jboolean supportsStandardImageMetadataFormat = 0;
+  static ::java::lang::String * nativeImageMetadataFormatName;
+  static ::java::lang::String * nativeImageMetadataFormatClassName;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
+  static JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
+private:
+  static ::gnu::javax::imageio::jpeg::JPEGImageReaderSpi * readerSpi;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGMarker.h b/libjava/gnu/javax/imageio/jpeg/JPEGMarker.h
new file mode 100644
index 000000000..bbfb11e67
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGMarker.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGMarker__
+#define __gnu_javax_imageio_jpeg_JPEGMarker__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGMarker;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGMarker : public ::java::lang::Object
+{
+
+public:
+  JPEGMarker();
+  static const jbyte JFIF_J = 74;
+  static const jbyte JFIF_F = 70;
+  static const jbyte JFIF_I = 73;
+  static const jbyte JFIF_X = 70;
+  static const jbyte JFXX_JPEG = 16;
+  static const jbyte JFXX_ONE_BPP = 17;
+  static const jbyte JFXX_THREE_BPP = 19;
+  static const jbyte XFF = -1;
+  static const jbyte X00 = 0;
+  static const jbyte APP0 = -32;
+  static const jbyte APP1 = -31;
+  static const jbyte APP2 = -30;
+  static const jbyte APP3 = -29;
+  static const jbyte APP4 = -28;
+  static const jbyte APP5 = -27;
+  static const jbyte APP6 = -26;
+  static const jbyte APP7 = -25;
+  static const jbyte APP8 = -24;
+  static const jbyte APP9 = -23;
+  static const jbyte APP10 = -22;
+  static const jbyte APP11 = -21;
+  static const jbyte APP12 = -20;
+  static const jbyte APP13 = -19;
+  static const jbyte APP14 = -18;
+  static const jbyte APP15 = -17;
+  static const jbyte RST0 = -48;
+  static const jbyte RST1 = -47;
+  static const jbyte RST2 = -46;
+  static const jbyte RST3 = -45;
+  static const jbyte RST4 = -44;
+  static const jbyte RST5 = -43;
+  static const jbyte RST6 = -42;
+  static const jbyte RST7 = -41;
+  static const jbyte SOF0 = -64;
+  static const jbyte SOF1 = -63;
+  static const jbyte SOF2 = -62;
+  static const jbyte SOF3 = -61;
+  static const jbyte SOF5 = -59;
+  static const jbyte SOF6 = -58;
+  static const jbyte SOF7 = -57;
+  static const jbyte SOF9 = -55;
+  static const jbyte SOF10 = -54;
+  static const jbyte SOF11 = -53;
+  static const jbyte SOF13 = -51;
+  static const jbyte SOF14 = -50;
+  static const jbyte SOF15 = -49;
+  static const jbyte DHT = -60;
+  static const jbyte DQT = -37;
+  static const jbyte SOS = -38;
+  static const jbyte DRI = -35;
+  static const jbyte COM = -2;
+  static const jbyte SOI = -40;
+  static const jbyte EOI = -39;
+  static const jbyte DNL = -36;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGMarker__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.h b/libjava/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.h
new file mode 100644
index 000000000..d7c376cf8
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGMarkerFoundException__
+#define __gnu_javax_imageio_jpeg_JPEGMarkerFoundException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGMarkerFoundException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGMarkerFoundException : public ::java::io::IOException
+{
+
+public:
+  JPEGMarkerFoundException();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGMarkerFoundException__
diff --git a/libjava/gnu/javax/imageio/jpeg/JPEGScan.h b/libjava/gnu/javax/imageio/jpeg/JPEGScan.h
new file mode 100644
index 000000000..502328656
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/JPEGScan.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_JPEGScan__
+#define __gnu_javax_imageio_jpeg_JPEGScan__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class JPEGComponent;
+            class JPEGScan;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::JPEGScan : public ::java::lang::Object
+{
+
+public:
+  JPEGScan();
+  JPEGScan(jint, jint);
+private:
+  void recalculateDimensions();
+public:
+  virtual void addComponent(jbyte, jbyte, jbyte, jbyte);
+  virtual ::gnu::javax::imageio::jpeg::JPEGComponent * getComponentByID(jbyte);
+  virtual ::gnu::javax::imageio::jpeg::JPEGComponent * get(jint);
+  virtual jint getX(jbyte);
+  virtual jint getY(jbyte);
+  virtual jint getMaxV();
+  virtual jint getMaxH();
+  virtual void setWidth(jint);
+  virtual void setHeight(jint);
+  virtual jint size();
+  virtual jint sizeComponentBlocks();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) maxHeight;
+  jint maxWidth;
+  jint maxV;
+  jint maxH;
+  jint numOfComponents;
+  jint numOfComponentBlocks;
+  ::java::util::ArrayList * components;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_JPEGScan__
diff --git a/libjava/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.h b/libjava/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.h
new file mode 100644
index 000000000..0d107f2bb
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_YCbCr_ColorSpace__
+#define __gnu_javax_imageio_jpeg_YCbCr_ColorSpace__
+
+#pragma interface
+
+#include <java/awt/color/ColorSpace.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class YCbCr_ColorSpace;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::YCbCr_ColorSpace : public ::java::awt::color::ColorSpace
+{
+
+public:
+  YCbCr_ColorSpace();
+  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
+  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
+  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
+  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
+  static JArray< jfloat > * toYCbCr(JArray< jfloat > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_YCbCr_ColorSpace__
diff --git a/libjava/gnu/javax/imageio/jpeg/ZigZag.h b/libjava/gnu/javax/imageio/jpeg/ZigZag.h
new file mode 100644
index 000000000..611108857
--- /dev/null
+++ b/libjava/gnu/javax/imageio/jpeg/ZigZag.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_jpeg_ZigZag__
+#define __gnu_javax_imageio_jpeg_ZigZag__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace jpeg
+        {
+            class ZigZag;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::jpeg::ZigZag : public ::java::lang::Object
+{
+
+public:
+  ZigZag();
+  static JArray< jbyte > * encode(JArray< JArray< jbyte > * > *);
+  static JArray< jdouble > * encode(JArray< JArray< jdouble > * > *);
+  static JArray< jfloat > * encode(JArray< JArray< jfloat > * > *);
+  static JArray< jshort > * encode(JArray< JArray< jshort > * > *);
+  static JArray< JArray< jdouble > * > * decode(JArray< jdouble > *);
+  static JArray< JArray< jbyte > * > * decode(JArray< jbyte > *);
+  static JArray< JArray< jint > * > * decode(JArray< jint > *);
+  static JArray< JArray< jbyte > * > * decode(JArray< jbyte > *, jint, jint);
+  static JArray< JArray< jdouble > * > * decode(JArray< jdouble > *, jint, jint);
+  static JArray< JArray< jfloat > * > * decode(JArray< jfloat > *, jint, jint);
+  static JArray< JArray< jint > * > * decode(JArray< jint > *, jint, jint);
+  static JArray< JArray< jdouble > * > * decode8x8_map(JArray< jdouble > *);
+  static const jboolean ZIGZAG_FORWARD = 1;
+  static const jboolean ZIGZAG_BACKWARD = 0;
+  static JArray< jint > * ZIGZAG_8X8_MAP;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_jpeg_ZigZag__
diff --git a/libjava/gnu/javax/imageio/png/PNGChunk.h b/libjava/gnu/javax/imageio/png/PNGChunk.h
new file mode 100644
index 000000000..849b43632
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGChunk.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGChunk__
+#define __gnu_javax_imageio_png_PNGChunk__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGChunk;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGChunk : public ::java::lang::Object
+{
+
+public: // actually protected
+  PNGChunk(jint, JArray< jbyte > *, jint);
+  PNGChunk(jint);
+public:
+  static ::gnu::javax::imageio::png::PNGChunk * readChunk(::java::io::InputStream *, jboolean);
+private:
+  static ::gnu::javax::imageio::png::PNGChunk * getChunk(jint, JArray< jbyte > *, jint);
+  static jboolean isEssentialChunk(jint);
+public:
+  virtual jboolean isValidChunk();
+  virtual jint getType();
+  virtual void writeChunk(::java::io::OutputStream *);
+  virtual jboolean isEmpty();
+  static JArray< jbyte > * getInt(jint);
+private:
+  jint calcCRC();
+public:
+  virtual ::java::lang::String * toString();
+private:
+  static JArray< jlong > * crcTable;
+public:
+  static const jint TYPE_HEADER = 1229472850;
+  static const jint TYPE_PALETTE = 1347179589;
+  static const jint TYPE_DATA = 1229209940;
+  static const jint TYPE_TIME = 1950960965;
+  static const jint TYPE_END = 1229278788;
+  static const jint TYPE_PHYS = 1883789683;
+  static const jint TYPE_GAMMA = 1732332865;
+  static const jint TYPE_PROFILE = 1766015824;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+public: // actually protected
+  JArray< jbyte > * data;
+private:
+  jint crc;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGChunk__
diff --git a/libjava/gnu/javax/imageio/png/PNGData.h b/libjava/gnu/javax/imageio/png/PNGData.h
new file mode 100644
index 000000000..16a04a2c4
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGData.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGData__
+#define __gnu_javax_imageio_png_PNGData__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGData;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGData : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGData(jint, JArray< jbyte > *, jint);
+  PNGData(jint);
+public:
+  virtual void deflateToChunk(::java::util::zip::Deflater *);
+  virtual jboolean chunkFull();
+  virtual void shrink();
+  virtual void feedToInflater(::java::util::zip::Inflater *);
+  virtual ::java::lang::String * toString();
+private:
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGData__
diff --git a/libjava/gnu/javax/imageio/png/PNGDecoder.h b/libjava/gnu/javax/imageio/png/PNGDecoder.h
new file mode 100644
index 000000000..70e6f3944
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGDecoder.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGDecoder__
+#define __gnu_javax_imageio_png_PNGDecoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGData;
+            class PNGDecoder;
+            class PNGHeader;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace color
+      {
+          class ColorSpace;
+      }
+      namespace image
+      {
+          class ColorModel;
+          class DataBuffer;
+          class IndexColorModel;
+          class WritableRaster;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGDecoder : public ::java::lang::Object
+{
+
+public:
+  PNGDecoder(::gnu::javax::imageio::png::PNGHeader *);
+private:
+  jint getBytes(JArray< jbyte > *, jint);
+public:
+  virtual void addData(::gnu::javax::imageio::png::PNGData *);
+  virtual ::java::awt::image::WritableRaster * getRaster(::gnu::javax::imageio::png::PNGHeader *);
+private:
+  ::java::awt::image::DataBuffer * getShortBuffer();
+  ::java::awt::image::DataBuffer * getByteBuffer();
+public:
+  virtual ::java::awt::image::ColorModel * getColorModel(::java::awt::color::ColorSpace *, jint, jint);
+private:
+  ::java::awt::image::IndexColorModel * grayPalette(jint);
+public:
+  virtual JArray< jbyte > * getRaster();
+  virtual jboolean isFinished();
+private:
+  ::gnu::javax::imageio::png::PNGHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
+  JArray< jbyte > * raster;
+  JArray< jbyte > * scanline;
+  JArray< jbyte > * lastScanline;
+  JArray< jbyte > * filterType;
+  jint offset;
+  jint length;
+  jint currentScanline;
+  jint stride;
+  ::java::util::zip::Inflater * inflater;
+  jboolean readFilter;
+  jint bpp;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGDecoder__
diff --git a/libjava/gnu/javax/imageio/png/PNGEncoder.h b/libjava/gnu/javax/imageio/png/PNGEncoder.h
new file mode 100644
index 000000000..e985ee10b
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGEncoder.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGEncoder__
+#define __gnu_javax_imageio_png_PNGEncoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGEncoder;
+            class PNGHeader;
+            class PNGICCProfile;
+            class PNGPalette;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGEncoder : public ::java::lang::Object
+{
+
+public:
+  PNGEncoder(::java::awt::image::BufferedImage *);
+  virtual ::gnu::javax::imageio::png::PNGHeader * getHeader();
+  virtual ::gnu::javax::imageio::png::PNGPalette * getPalette();
+  virtual ::gnu::javax::imageio::png::PNGICCProfile * getProfile();
+  virtual ::java::util::Vector * encodeImage();
+private:
+  void getRawData(::java::awt::image::BufferedImage *);
+  static const jint defaultChunkSize = 8192;
+  ::gnu::javax::imageio::png::PNGHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
+  ::gnu::javax::imageio::png::PNGPalette * palette;
+  jint stride;
+  jint bpp;
+  JArray< jbyte > * rawData;
+  ::gnu::javax::imageio::png::PNGICCProfile * profile;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGEncoder__
diff --git a/libjava/gnu/javax/imageio/png/PNGException.h b/libjava/gnu/javax/imageio/png/PNGException.h
new file mode 100644
index 000000000..d02406961
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGException__
+#define __gnu_javax_imageio_png_PNGException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGException : public ::java::io::IOException
+{
+
+public:
+  PNGException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGException__
diff --git a/libjava/gnu/javax/imageio/png/PNGFile.h b/libjava/gnu/javax/imageio/png/PNGFile.h
new file mode 100644
index 000000000..a1b5fdfb6
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGFile.h
@@ -0,0 +1,75 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGFile__
+#define __gnu_javax_imageio_png_PNGFile__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGDecoder;
+            class PNGEncoder;
+            class PNGFile;
+            class PNGHeader;
+            class PNGPalette;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace color
+      {
+          class ColorSpace;
+      }
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGFile : public ::java::lang::Object
+{
+
+public:
+  PNGFile(::java::io::InputStream *);
+  PNGFile(::java::awt::image::BufferedImage *);
+  virtual void writePNG(::java::io::OutputStream *);
+private:
+  jboolean validateHeader(JArray< jbyte > *);
+public:
+  virtual ::java::awt::image::BufferedImage * getBufferedImage();
+private:
+  ::gnu::javax::imageio::png::PNGPalette * getPalette();
+  ::java::awt::color::ColorSpace * getColorSpace();
+  static JArray< jbyte > * signature;
+  static JArray< jbyte > * endChunk;
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) chunks;
+  ::gnu::javax::imageio::png::PNGHeader * header;
+  jboolean hasPalette;
+  jint width;
+  jint height;
+  ::gnu::javax::imageio::png::PNGDecoder * decoder;
+  ::gnu::javax::imageio::png::PNGEncoder * encoder;
+  ::java::awt::image::BufferedImage * sourceImage;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGFile__
diff --git a/libjava/gnu/javax/imageio/png/PNGFilter.h b/libjava/gnu/javax/imageio/png/PNGFilter.h
new file mode 100644
index 000000000..c461f59a2
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGFilter.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGFilter__
+#define __gnu_javax_imageio_png_PNGFilter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGFilter;
+            class PNGHeader;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGFilter : public ::java::lang::Object
+{
+
+public:
+  PNGFilter();
+  static jboolean useFilter(::gnu::javax::imageio::png::PNGHeader *);
+  static jbyte chooseFilter(JArray< jbyte > *, JArray< jbyte > *, jint);
+  static JArray< jbyte > * filterScanline(jbyte, JArray< jbyte > *, JArray< jbyte > *, jint);
+  static JArray< jbyte > * unFilterScanline(jint, JArray< jbyte > *, JArray< jbyte > *, jint);
+  static const jbyte FILTER_NONE = 0;
+  static const jbyte FILTER_SUB = 1;
+  static const jbyte FILTER_UP = 2;
+  static const jbyte FILTER_AVERAGE = 3;
+  static const jbyte FILTER_PAETH = 4;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGFilter__
diff --git a/libjava/gnu/javax/imageio/png/PNGGamma.h b/libjava/gnu/javax/imageio/png/PNGGamma.h
new file mode 100644
index 000000000..e6458f43c
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGGamma.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGGamma__
+#define __gnu_javax_imageio_png_PNGGamma__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGGamma;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace color
+      {
+          class ColorSpace;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGGamma : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGGamma(jint, JArray< jbyte > *, jint);
+public:
+  PNGGamma(jdouble);
+  virtual ::java::awt::color::ColorSpace * getColorSpace(jboolean);
+  virtual ::java::lang::String * toString();
+private:
+  jdouble __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) gamma;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGGamma__
diff --git a/libjava/gnu/javax/imageio/png/PNGHeader.h b/libjava/gnu/javax/imageio/png/PNGHeader.h
new file mode 100644
index 000000000..190268003
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGHeader.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGHeader__
+#define __gnu_javax_imageio_png_PNGHeader__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGHeader;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGHeader : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGHeader(jint, JArray< jbyte > *, jint);
+public:
+  PNGHeader(jint, jint, jint, jint, jboolean);
+  virtual jboolean isValidChunk();
+  virtual jboolean isIndexed();
+  virtual jboolean isGrayscale();
+  virtual jint getColorType();
+  virtual jboolean isInterlaced();
+  virtual jint bytesPerPixel();
+  virtual jint getScanlineStride();
+  virtual jint getWidth();
+  virtual jint getHeight();
+  virtual jint getDepth();
+  virtual ::java::lang::String * toString();
+private:
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) width;
+  jint height;
+  jint depth;
+  jint colorType;
+  jint compression;
+  jint filter;
+  jint interlace;
+public:
+  static const jint INTERLACE_NONE = 0;
+  static const jint INTERLACE_ADAM7 = 1;
+  static const jint GRAYSCALE = 0;
+  static const jint RGB = 2;
+  static const jint INDEXED = 3;
+  static const jint GRAYSCALE_WITH_ALPHA = 4;
+  static const jint RGB_WITH_ALPHA = 6;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGHeader__
diff --git a/libjava/gnu/javax/imageio/png/PNGICCProfile.h b/libjava/gnu/javax/imageio/png/PNGICCProfile.h
new file mode 100644
index 000000000..1495ded5d
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGICCProfile.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGICCProfile__
+#define __gnu_javax_imageio_png_PNGICCProfile__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGICCProfile;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace color
+      {
+          class ColorSpace;
+          class ICC_Profile;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGICCProfile : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGICCProfile(jint, JArray< jbyte > *, jint);
+public:
+  PNGICCProfile(::java::awt::color::ICC_Profile *);
+  virtual ::java::awt::color::ColorSpace * getColorSpace();
+  virtual ::java::lang::String * toString();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) name;
+  ::java::awt::color::ICC_Profile * profile;
+  static JArray< jbyte > * genericName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGICCProfile__
diff --git a/libjava/gnu/javax/imageio/png/PNGImageReader.h b/libjava/gnu/javax/imageio/png/PNGImageReader.h
new file mode 100644
index 000000000..5ef99a738
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGImageReader.h
@@ -0,0 +1,75 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGImageReader__
+#define __gnu_javax_imageio_png_PNGImageReader__
+
+#pragma interface
+
+#include <javax/imageio/ImageReader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGFile;
+            class PNGImageReader;
+            class PNGImageReaderSpi;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReadParam;
+      namespace metadata
+      {
+          class IIOMetadata;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGImageReader : public ::javax::imageio::ImageReader
+{
+
+public:
+  PNGImageReader(::gnu::javax::imageio::png::PNGImageReaderSpi *);
+  virtual jint getHeight(jint);
+  virtual jint getWidth(jint);
+  virtual ::java::util::Iterator * getImageTypes(jint);
+  virtual jint getNumImages(jboolean);
+  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *);
+  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
+  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint);
+  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata();
+private:
+  void checkIndex(jint);
+  void readImage();
+  ::gnu::javax::imageio::png::PNGFile * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReader)))) pngFile;
+  ::java::awt::image::BufferedImage * image;
+  ::java::util::ArrayList * imageTypes;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGImageReader__
diff --git a/libjava/gnu/javax/imageio/png/PNGImageReaderSpi.h b/libjava/gnu/javax/imageio/png/PNGImageReaderSpi.h
new file mode 100644
index 000000000..61b6b3f73
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGImageReaderSpi.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGImageReaderSpi__
+#define __gnu_javax_imageio_png_PNGImageReaderSpi__
+
+#pragma interface
+
+#include <javax/imageio/spi/ImageReaderSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGImageReaderSpi;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace imageio
+    {
+        class ImageReader;
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGImageReaderSpi : public ::javax::imageio::spi::ImageReaderSpi
+{
+
+public:
+  PNGImageReaderSpi();
+  virtual jboolean canDecodeInput(::java::lang::Object *);
+  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *);
+  virtual ::java::lang::String * getDescription(::java::util::Locale *);
+private:
+  static JArray< jbyte > * SIGNATURE;
+  static ::java::lang::String * VENDOR_NAME;
+public: // actually package-private
+  static ::java::lang::String * VERSION;
+  static ::java::lang::String * READER_CLASSNAME;
+  static JArray< ::java::lang::String * > * NAMES;
+  static JArray< ::java::lang::String * > * SUFFIXES;
+  static JArray< ::java::lang::String * > * MIME_TYPES;
+  static JArray< ::java::lang::String * > * WRITER_SPI_NAMES;
+  static JArray< ::java::lang::Class * > * INPUT_TYPES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGImageReaderSpi__
diff --git a/libjava/gnu/javax/imageio/png/PNGPalette.h b/libjava/gnu/javax/imageio/png/PNGPalette.h
new file mode 100644
index 000000000..d216b1b5e
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGPalette.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGPalette__
+#define __gnu_javax_imageio_png_PNGPalette__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGPalette;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+      namespace color
+      {
+          class ColorSpace;
+      }
+      namespace image
+      {
+          class IndexColorModel;
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGPalette : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGPalette(jint, JArray< jbyte > *, jint);
+public:
+  PNGPalette(::java::awt::image::IndexColorModel *);
+  virtual ::java::awt::image::IndexColorModel * getPalette(::java::awt::color::ColorSpace *);
+  virtual ::java::lang::String * toString();
+private:
+  JArray< jint > * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) red;
+  JArray< jint > * green;
+  JArray< jint > * blue;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGPalette__
diff --git a/libjava/gnu/javax/imageio/png/PNGPhys.h b/libjava/gnu/javax/imageio/png/PNGPhys.h
new file mode 100644
index 000000000..fa4476de8
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGPhys.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGPhys__
+#define __gnu_javax_imageio_png_PNGPhys__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGPhys;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGPhys : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGPhys(jint, JArray< jbyte > *, jint);
+public:
+  PNGPhys(jdouble);
+  PNGPhys(jint, jint);
+private:
+  void makeData();
+public:
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  jlong __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) x;
+  jlong y;
+  jdouble ratio;
+  jboolean usesRatio;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGPhys__
diff --git a/libjava/gnu/javax/imageio/png/PNGTime.h b/libjava/gnu/javax/imageio/png/PNGTime.h
new file mode 100644
index 000000000..1e07099b1
--- /dev/null
+++ b/libjava/gnu/javax/imageio/png/PNGTime.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_imageio_png_PNGTime__
+#define __gnu_javax_imageio_png_PNGTime__
+
+#pragma interface
+
+#include <gnu/javax/imageio/png/PNGChunk.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace imageio
+      {
+        namespace png
+        {
+            class PNGTime;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::imageio::png::PNGTime : public ::gnu::javax::imageio::png::PNGChunk
+{
+
+public: // actually protected
+  PNGTime(jint, JArray< jbyte > *, jint);
+public:
+  PNGTime(::java::util::Date *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::util::Date * __attribute__((aligned(__alignof__( ::gnu::javax::imageio::png::PNGChunk)))) date;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_imageio_png_PNGTime__