Unforked:

-sun/awt/image/ByteComponentRaster.java
-sun/awt/image/BytePackedRaster.java
-sun/awt/image/IntegerComponentRaster.java
-sun/awt/image/OffScreenImageSource.java
-sun/awt/image/ShortComponentRaster.java

7 files changed, 591 insertions, 4168 deletions

diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
index 7401541e..6133cc10 100644
--- a/openjdk/allsources.lst
+++ b/openjdk/allsources.lst
@@ -156,18 +156,13 @@ sun/awt/AppContext.java
 sun/awt/AppContextDC.java
 sun/awt/EmbeddedFrame.java
 sun/awt/IkvmDataTransferer.java
-sun/awt/image/ByteComponentRaster.java
 sun/awt/image/ByteInterleavedRaster.java
-sun/awt/image/BytePackedRaster.java
 sun/awt/image/GifImageDecoder.java
 sun/awt/image/IkvmImageDecoder.java
 sun/awt/image/ImageRepresentation.java
 sun/awt/image/ImagingLib.java
-sun/awt/image/IntegerComponentRaster.java
 sun/awt/image/IntegerInterleavedRaster.java
 sun/awt/image/JPEGImageDecoder.java
-sun/awt/image/OffScreenImageSource.java
-sun/awt/image/ShortComponentRaster.java
 sun/awt/image/SunWritableRaster.java
 sun/awt/image/ToolkitImage.java
 sun/awt/shell/Win32ShellFolder2.java
@@ -11398,6 +11393,8 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ByteArrayImageSource.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java
+@OPENJDK7@/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java
+@OPENJDK7@/jdk/src/share/classes/sun/awt/image/BytePackedRaster.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/FileImageSource.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ImageConsumerQueue.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ImageDecoder.java
@@ -11406,9 +11403,13 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ImageFormatException.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ImageWatched.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/InputStreamImageSource.java
+@OPENJDK7@/jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java
+@OPENJDK7@/jdk/src/share/classes/sun/awt/image/NativeLibLoader.java
+@OPENJDK7@/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/PixelConverter.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java
+@OPENJDK7@/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/URLImageSource.java
 @OPENJDK7@/jdk/src/share/classes/sun/awt/image/VSyncedBSManager.java
diff --git a/openjdk/sun/awt/image/ByteComponentRaster.java b/openjdk/sun/awt/image/ByteComponentRaster.java
deleted file mode 100644
index 133a6d68..00000000
--- a/openjdk/sun/awt/image/ByteComponentRaster.java
+++ /dev/null
@@ -1,960 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.RasterFormatException;
-import java.awt.image.SampleModel;
-import java.awt.image.ComponentSampleModel;
-import java.awt.image.SinglePixelPackedSampleModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.Rectangle;
-import java.awt.Point;
-
-/**
- * This class defines a Raster with pixels consisting of one or more 8-bit
- * data elements stored in close proximity to each other in a single byte
- * array.
- * The bit precision per data element is that
- * of the data type (that is, the bit precision for this Raster is 8).
- * There is only one pixel stride and one scanline stride for all
- * bands.  This type of Raster can be used with a
- * ComponentColorModel if there are multiple bands, or an
- * IndexColorModel if there is only one band.
- * <p>
- * For example, 3-3-2 RGB image data can be represented by a
- * ByteComponentRaster using a SinglePixelPackedSampleModel and
- * a ComponentColorModel.
- *
- */
-public class ByteComponentRaster extends SunWritableRaster {
-
-    /** private band offset for use by native code */
-    protected int bandOffset;
-
-    /** Data offsets for each band of image data. */
-    protected int[]         dataOffsets;
-
-    /** Scanline stride of the image data contained in this Raster. */
-    protected int           scanlineStride;
-
-    /** Pixel stride of the image data contained in this Raster. */
-    protected int           pixelStride;
-
-    /** The image data array. */
-    protected byte[]        data;
-
-    int type;
-
-    /** A cached copy of minX + width for use in bounds checks. */
-    private int maxX;
-
-    /** A cached copy of minY + height for use in bounds checks. */
-    private int maxY;
-
-    /**
-     * Constructs a ByteComponentRaster with the given SampleModel.
-     * The Raster's upper left corner is origin and it is the same
-     * size as the SampleModel.  A DataBuffer large enough to describe the
-     * Raster is automatically created.  SampleModel must be of type
-     * SinglePixelPackedSampleModel or ComponentSampleModel.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param origin          The Point that specified the origin.
-     */
-    public ByteComponentRaster(SampleModel sampleModel, Point origin) {
-        this(sampleModel,
-             sampleModel.createDataBuffer(),
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a ByteComponentRaster with the given SampleModel
-     * and DataBuffer.  The Raster's upper left corner is origin and
-     * it is the same size as the SampleModel.  The DataBuffer is not
-     * initialized and must be a DataBufferByte compatible with SampleModel.
-     * SampleModel must be of type SinglePixelPackedSampleModel
-     * or ComponentSampleModel.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferShort that contains the image data.
-     * @param origin          The Point that specifies the origin.
-     */
-    public ByteComponentRaster(SampleModel sampleModel,
-                                  DataBuffer dataBuffer,
-                                  Point origin) {
-        this(sampleModel,
-             dataBuffer,
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a ByteComponentRaster with the given SampleModel,
-     * DataBuffer, and parent.  DataBuffer must be a DataBufferByte and
-     * SampleModel must be of type SinglePixelPackedSampleModel
-     * or ComponentSampleModel.
-     * When translated into the base Raster's
-     * coordinate system, aRegion must be contained by the base Raster.
-     * Origin is the coordinate in the new Raster's coordinate system of
-     * the origin of the base Raster.  (The base Raster is the Raster's
-     * ancestor which has no parent.)
-     *
-     * Note that this constructor should generally be called by other
-     * constructors or create methods, it should not be used directly.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferShort that contains the image data.
-     * @param aRegion         The Rectangle that specifies the image area.
-     * @param origin          The Point that specifies the origin.
-     * @param parent          The parent (if any) of this raster.
-     */
-    public ByteComponentRaster(SampleModel sampleModel,
-                                  DataBuffer dataBuffer,
-                                  Rectangle aRegion,
-                                  Point origin,
-                                  ByteComponentRaster parent) {
-        super(sampleModel, dataBuffer, aRegion, origin, parent);
-        this.maxX = minX + width;
-        this.maxY = minY + height;
-
-        if (!(dataBuffer instanceof DataBufferByte)) {
-            throw new RasterFormatException("ByteComponentRasters must have " +
-                                            "byte DataBuffers");
-        }
-
-        DataBufferByte dbb = (DataBufferByte)dataBuffer;
-        this.data = stealData(dbb, 0);
-        if (dbb.getNumBanks() != 1) {
-            throw new
-                RasterFormatException("DataBuffer for ByteComponentRasters"+
-                                      " must only have 1 bank.");
-        }
-        int dbOffset = dbb.getOffset();
-
-        if (sampleModel instanceof ComponentSampleModel) {
-            ComponentSampleModel ism = (ComponentSampleModel)sampleModel;
-            this.type = IntegerComponentRaster.TYPE_BYTE_SAMPLES;
-            this.scanlineStride = ism.getScanlineStride();
-            this.pixelStride = ism.getPixelStride();
-            this.dataOffsets = ism.getBandOffsets();
-            int xOffset = aRegion.x - origin.x;
-            int yOffset = aRegion.y - origin.y;
-            for (int i = 0; i < getNumDataElements(); i++) {
-                dataOffsets[i] += dbOffset +
-                    xOffset*pixelStride+yOffset*scanlineStride;
-            }
-        } else if (sampleModel instanceof SinglePixelPackedSampleModel) {
-            SinglePixelPackedSampleModel sppsm =
-                    (SinglePixelPackedSampleModel)sampleModel;
-            this.type = IntegerComponentRaster.TYPE_BYTE_PACKED_SAMPLES;
-            this.scanlineStride = sppsm.getScanlineStride();
-            this.pixelStride    = 1;
-            this.dataOffsets = new int[1];
-            this.dataOffsets[0] = dbOffset;
-            int xOffset = aRegion.x - origin.x;
-            int yOffset = aRegion.y - origin.y;
-            dataOffsets[0] += xOffset*pixelStride+yOffset*scanlineStride;
-        } else {
-            throw new RasterFormatException("IntegerComponentRasters must " +
-                "have ComponentSampleModel or SinglePixelPackedSampleModel");
-        }
-        this.bandOffset = this.dataOffsets[0];
-
-        verify();
-    }
-
-    /**
-     * Returns a copy of the data offsets array. For each band the data offset
-     * is the index into the band's data array, of the first sample of the
-     * band.
-     */
-    public int[] getDataOffsets() {
-        return (int[]) dataOffsets.clone();
-    }
-
-    /**
-     * Returns the data offset for the specified band.  The data offset
-     * is the index into the data array
-     * in which the first sample of the first scanline is stored.
-     * @param band  The band whose offset is returned.
-     */
-    public int getDataOffset(int band) {
-        return dataOffsets[band];
-    }
-
-    /**
-     * Returns the scanline stride -- the number of data array elements between
-     * a given sample and the sample in the same column of the next row in the
-     * same band.
-     */
-    public int getScanlineStride() {
-        return scanlineStride;
-    }
-
-    /**
-     * Returns pixel stride -- the number of data array elements between two
-     * samples for the same band on the same scanline.
-     */
-    public int getPixelStride() {
-        return pixelStride;
-    }
-
-    /**
-     * Returns a reference to the data array.
-     */
-    public byte[] getDataStorage() {
-        return data;
-    }
-
-    /**
-     * Returns the data elements for all bands at the specified
-     * location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte outData[];
-        if (obj == null) {
-            outData = new byte[numDataElements];
-        } else {
-            outData = (byte[])obj;
-        }
-        int off = (y-minY)*scanlineStride +
-                  (x-minX)*pixelStride;
-
-        for (int band = 0; band < numDataElements; band++) {
-            outData[band] = data[dataOffsets[band] + off];
-        }
-
-        return outData;
-    }
-
-    /**
-     * Returns an array of data elements from the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * <pre>
-     *       byte[] bandData = (byte[])raster.getDataElements(x, y, w, h, null);
-     *       int numDataElements = raster.getNumDataElements();
-     *       byte[] pixel = new byte[numDataElements];
-     *       // To find a data element at location (x2, y2)
-     *       System.arraycopy(bandData, ((y2-y)*w + (x2-x))*numDataElements,
-     *                        pixel, 0, numDataElements);
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte outData[];
-        if (obj == null) {
-            outData = new byte[w*h*numDataElements];
-        } else {
-            outData = (byte[])obj;
-        }
-
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    outData[off++] = data[dataOffsets[c] + xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-    /**
-     * Returns a byte array of data elements from the specified rectangular
-     * region for the specified band.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * <pre>
-     *       byte[] bandData = raster.getByteData(x, y, w, h, null);
-     *       // To find the data element at location (x2, y2)
-     *       byte bandElement = bandData[((y2-y)*w + (x2-x))];
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param band     The band to return.
-     * @param outData  If non-null, data elements for all bands
-     *                 at the specified location are returned in this array.
-     * @return         Data array with data elements for all bands.
-     */
-    public byte[] getByteData(int x, int y, int w, int h,
-                              int band, byte[] outData) {
-        // Bounds check for 'band' will be performed automatically
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (outData == null) {
-            outData = new byte[scanlineStride*h];
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride + dataOffsets[band];
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        if (pixelStride == 1) {
-            if (scanlineStride == w) {
-                System.arraycopy(data, yoff, outData, 0, w*h);
-            }
-            else {
-                for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                    System.arraycopy(data, yoff, outData, off, w);
-                    off += w;
-                }
-            }
-        }
-        else {
-            for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                xoff = yoff;
-                for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                    outData[off++] = data[xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-    /**
-     * Returns a byte array of data elements from the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * <pre>
-     *       byte[] bandData = raster.getByteData(x, y, w, h, null);
-     *       int numDataElements = raster.getnumDataElements();
-     *       byte[] pixel = new byte[numDataElements];
-     *       // To find a data element at location (x2, y2)
-     *       System.arraycopy(bandData, ((y2-y)*w + (x2-x))*numDataElements,
-     *                        pixel, 0, numDataElements);
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  If non-null, data elements for all bands
-     *                 at the specified location are returned in this array.
-     * @return         Data array with data elements for all bands.
-     */
-    public byte[] getByteData(int x, int y, int w, int h, byte[] outData) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (outData == null) {
-            outData = new byte[numDataElements*scanlineStride*h];
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        // REMIND: Should keep track if dataOffsets are in a nice order
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    outData[off++] = data[dataOffsets[c] + xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-    /**
-     * Stores the data elements for all bands at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements()
-     *                 containing the pixel data to place at x,y.
-     */
-    public void setDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte inData[] = (byte[])obj;
-        int off = (y-minY)*scanlineStride +
-                  (x-minX)*pixelStride;
-
-        for (int i = 0; i < numDataElements; i++) {
-            data[dataOffsets[i] + off] = inData[i];
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * @param x          The X coordinate of the pixel location.
-     * @param y          The Y coordinate of the pixel location.
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    public void setDataElements(int x, int y, Raster inRaster) {
-        int dstOffX = inRaster.getMinX() + x;
-        int dstOffY = inRaster.getMinY() + y;
-        int width  = inRaster.getWidth();
-        int height = inRaster.getHeight();
-        if ((dstOffX < this.minX) || (dstOffY < this.minY) ||
-            (dstOffX + width > this.maxX) || (dstOffY + height > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-
-        setDataElements(dstOffX, dstOffY, width, height, inRaster);
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * @param dstX The absolute X coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param dstY The absolute Y coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param width      The number of pixels to store horizontally
-     * @param height     The number of pixels to store vertically
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    private void setDataElements(int dstX, int dstY,
-                                 int width, int height,
-                                 Raster inRaster) {
-        // Assume bounds checking has been performed previously
-        if (width <= 0 || height <= 0) {
-            return;
-        }
-
-        int srcOffX = inRaster.getMinX();
-        int srcOffY = inRaster.getMinY();
-        Object tdata = null;
-
-        if (inRaster instanceof ByteComponentRaster) {
-            ByteComponentRaster bct = (ByteComponentRaster) inRaster;
-            byte[] bdata = bct.getDataStorage();
-            // REMIND: Do something faster!
-            if (numDataElements == 1) {
-                int toff = bct.getDataOffset(0);
-                int tss  = bct.getScanlineStride();
-
-                int srcOffset = toff;
-                int dstOffset = dataOffsets[0]+(dstY-minY)*scanlineStride+
-                                               (dstX-minX);
-
-
-                if (pixelStride == bct.getPixelStride()) {
-                    width *= pixelStride;
-                    for (int tmpY=0; tmpY < height; tmpY++) {
-                        System.arraycopy(bdata, srcOffset,
-                                         data, dstOffset, width);
-                        srcOffset += tss;
-                        dstOffset += scanlineStride;
-                    }
-                    markDirty();
-                    return;
-                }
-            }
-        }
-
-        for (int startY=0; startY < height; startY++) {
-            // Grab one scanline at a time
-            tdata = inRaster.getDataElements(srcOffX, srcOffY+startY,
-                                             width, 1, tdata);
-            setDataElements(dstX, dstY+startY, width, 1, tdata);
-        }
-    }
-
-    /**
-     * Stores an array of data elements into the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * for the nth band at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))*numDataElements + n]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements()
-     *                 containing the pixel data to place between x,y and
-     *                 x+h, y+h.
-     */
-    public void setDataElements(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte inData[] = (byte[])obj;
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        if (numDataElements == 1) {
-            int srcOffset = 0;
-            int dstOffset = yoff + dataOffsets[0];
-            for (ystart=0; ystart < h; ystart++) {
-                xoff = yoff;
-                System.arraycopy(inData, srcOffset,
-                                 data, dstOffset, w);
-
-                srcOffset += w;
-                dstOffset += scanlineStride;
-            }
-            markDirty();
-            return;
-        }
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    data[dataOffsets[c] + xoff] = inData[off++];
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Stores a byte array of data elements into the specified rectangular
-     * region for the specified band.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x)) + n]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param band     The band to set.
-     * @param inData   The data elements to be stored.
-     */
-    public void putByteData(int x, int y, int w, int h,
-                            int band, byte[] inData) {
-        // Bounds check for 'band' will be performed automatically
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride + dataOffsets[band];
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        if (pixelStride == 1) {
-            if (scanlineStride == w) {
-                System.arraycopy(inData, 0, data, yoff, w*h);
-            }
-            else {
-                for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                    System.arraycopy(inData, off, data, yoff, w);
-                    off += w;
-                }
-            }
-        }
-        else {
-            for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                xoff = yoff;
-                for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                    data[xoff] = inData[off++];
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Stores a byte array of data elements into the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * for the nth band at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))*numDataElements + n]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   The data elements to be stored.
-     */
-    public void putByteData(int x, int y, int w, int h, byte[] inData) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        if (numDataElements == 1) {
-            yoff += dataOffsets[0];
-            if (pixelStride == 1) {
-                if (scanlineStride == w) {
-                    System.arraycopy(inData, 0, data, yoff, w*h);
-                }
-                else {
-                    for (ystart=0; ystart < h; ystart++) {
-                        System.arraycopy(inData, off, data, yoff, w);
-                        off += w;
-                        yoff += scanlineStride;
-                    }
-                }
-            }
-            else {
-                for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                    xoff = yoff;
-                    for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                        data[xoff] = inData[off++];
-                    }
-                }
-            }
-        }
-        else {
-            for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                xoff = yoff;
-                for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                    for (int c = 0; c < numDataElements; c++) {
-                        data[dataOffsets[c] + xoff] = inData[off++];
-                    }
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Creates a subraster given a region of the raster.  The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this raster to the upper-left corner
-     * of the subraster.  A subset of the bands of the parent Raster may
-     * be specified.  If this is null, then all the bands are present in the
-     * subRaster. A translation to the subRaster may also be specified.
-     * Note that the subraster will reference the same
-     * DataBuffer as the parent raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent raster.
-     */
-    public Raster createChild(int x, int y,
-                              int width, int height,
-                              int x0, int y0, int[] bandList) {
-        WritableRaster newRaster = createWritableChild(x, y,
-                                                       width, height,
-                                                       x0, y0,
-                                                       bandList);
-        return (Raster) newRaster;
-    }
-
-    /**
-     * Creates a Writable subRaster given a region of the Raster. The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this Raster to the upper-left corner
-     * of the subRaster.  A subset of the bands of the parent Raster may
-     * be specified.  If this is null, then all the bands are present in the
-     * subRaster. A translation to the subRaster may also be specified.
-     * Note that the subRaster will reference the same
-     * DataBuffer as the parent Raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent Raster.
-     */
-    public WritableRaster createWritableChild(int x, int y,
-                                              int width, int height,
-                                              int x0, int y0,
-                                              int[] bandList) {
-        if (x < this.minX) {
-            throw new RasterFormatException("x lies outside the raster");
-        }
-        if (y < this.minY) {
-            throw new RasterFormatException("y lies outside the raster");
-        }
-        if ((x+width < x) || (x+width > this.minX + this.width)) {
-            throw new RasterFormatException("(x + width) is outside of Raster");
-        }
-        if ((y+height < y) || (y+height > this.minY + this.height)) {
-            throw new RasterFormatException("(y + height) is outside of Raster");
-        }
-
-        SampleModel sm;
-
-        if (bandList != null)
-            sm = sampleModel.createSubsetSampleModel(bandList);
-        else
-            sm = sampleModel;
-
-        int deltaX = x0 - x;
-        int deltaY = y0 - y;
-
-        return new ByteComponentRaster(sm,
-                                       dataBuffer,
-                                       new Rectangle(x0, y0, width, height),
-                                       new Point(sampleModelTranslateX+deltaX,
-                                                 sampleModelTranslateY+deltaY),
-                                       this);
-    }
-
-    /**
-     * Creates a Raster with the same layout but using a different
-     * width and height, and with new zeroed data arrays.
-     */
-    public WritableRaster createCompatibleWritableRaster(int w, int h) {
-        if (w <= 0 || h <=0) {
-            throw new RasterFormatException("negative "+
-                                          ((w <= 0) ? "width" : "height"));
-        }
-
-        SampleModel sm = sampleModel.createCompatibleSampleModel(w, h);
-
-        return new ByteComponentRaster(sm , new Point(0,0));
-
-    }
-
-    /**
-     * Creates a Raster with the same layout and the same
-     * width and height, and with new zeroed data arrays.  If
-     * the Raster is a subRaster, this will call
-     * createCompatibleRaster(width, height).
-     */
-    public WritableRaster createCompatibleWritableRaster() {
-        return createCompatibleWritableRaster(width,height);
-    }
-
-    /**
-     * Verify that the layout parameters are consistent with the data.
-     *
-     * The method verifies whether scanline stride and pixel stride do not
-     * cause an integer overflow during calculation of a position of the pixel
-     * in data buffer. It also verifies whether the data buffer has enough data
-     *  to correspond the raster layout attributes.
-     *
-     * @throws RasterFormatException if an integer overflow is detected,
-     * or if data buffer has not enough capacity.
-     */
-    protected final void verify() {
-        /* Need to re-verify the dimensions since a sample model may be
-         * specified to the constructor
-         */
-        if (width <= 0 || height <= 0 ||
-            height > (Integer.MAX_VALUE / width))
-        {
-            throw new RasterFormatException("Invalid raster dimension");
-        }
-
-        for (int i = 0; i < dataOffsets.length; i++) {
-            if (dataOffsets[i] < 0) {
-                throw new RasterFormatException("Data offsets for band " + i
-                            + "(" + dataOffsets[i]
-                            + ") must be >= 0");
-            }
-        }
-
-        // we can be sure that width and height are greater than 0
-        if (scanlineStride < 0 ||
-            scanlineStride > (Integer.MAX_VALUE / height) ||
-            scanlineStride > data.length)
-        {
-            // integer overflow
-            throw new RasterFormatException("Incorrect scanline stride: "
-                    + scanlineStride);
-        }
-        int lastScanOffset = (height - 1) * scanlineStride;
-
-        if (pixelStride < 0 ||
-            pixelStride > (Integer.MAX_VALUE / width) ||
-            pixelStride > data.length)
-        {
-            // integer overflow
-            throw new RasterFormatException("Incorrect pixel stride: "
-                    + pixelStride);
-        }
-        int lastPixelOffset = (width - 1) * pixelStride;
-
-        if (lastPixelOffset > (Integer.MAX_VALUE - lastScanOffset)) {
-            // integer overflow
-            throw new RasterFormatException("Incorrect raster attributes");
-        }
-        lastPixelOffset += lastScanOffset;
-
-        int index;
-        int maxIndex = 0;
-        for (int i = 0; i < numDataElements; i++) {
-            if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
-                throw new RasterFormatException("Incorrect band offset: "
-                            + dataOffsets[i]);
-
-            }
-
-            index = lastPixelOffset + dataOffsets[i];
-
-            if (index > maxIndex) {
-                maxIndex = index;
-            }
-        }
-        if (data.length <= maxIndex) {
-            throw new RasterFormatException("Data array too small (should be > "
-                    + maxIndex + " )");
-        }
-    }
-
-    public String toString() {
-        return new String ("ByteComponentRaster: width = "+width+" height = "
-                           + height
-                           +" #numDataElements "+numDataElements
-                           //  +" xOff = "+xOffset+" yOff = "+yOffset
-                           +" dataOff[0] = "+dataOffsets[0]);
-    }
-
-//    /**
-//     * For debugging...  prints a region of a one-band ByteComponentRaster
-//     */
-//    public void print(int x, int y, int w, int h) {
-//        // REMIND:  Only works for 1 band!
-//        System.out.println(this);
-//        int offset = dataOffsets[0] + y*scanlineStride + x*pixelStride;
-//        int off;
-//        for (int yoff=0; yoff < h; yoff++, offset += scanlineStride) {
-//            off = offset;
-//            System.out.print("Line "+(y+yoff)+": ");
-//            for (int xoff = 0; xoff < w; xoff++, off+= pixelStride) {
-//                String s = Integer.toHexString(data[off]);
-//                if (s.length() == 8) {
-//                    s = s.substring(6,8);
-//                }
-//                System.out.print(s+" ");
-//            }
-//            System.out.println("");
-//        }
-//    }
-
-
-}
diff --git a/openjdk/sun/awt/image/BytePackedRaster.java b/openjdk/sun/awt/image/BytePackedRaster.java
deleted file mode 100644
index e9999c4c..00000000
--- a/openjdk/sun/awt/image/BytePackedRaster.java
+++ /dev/null
@@ -1,1414 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.RasterFormatException;
-import java.awt.image.SampleModel;
-import java.awt.image.MultiPixelPackedSampleModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.Rectangle;
-import java.awt.Point;
-
-/**
- * This class is useful for describing 1, 2, or 4 bit image data
- * elements.  This raster has one band whose pixels are packed
- * together into individual bytes in a single byte array.  This type
- * of raster can be used with an IndexColorModel. This raster uses a
- * MultiPixelPackedSampleModel.
- *
- */
-public class BytePackedRaster extends SunWritableRaster {
-
-    /** The data bit offset for each pixel. */
-    int           dataBitOffset;
-
-    /** Scanline stride of the image data contained in this Raster. */
-    int           scanlineStride;
-
-    /**
-     * The bit stride of a pixel, equal to the total number of bits
-     * required to store a pixel.
-     */
-    int           pixelBitStride;
-
-    /** The bit mask for extracting the pixel. */
-    int           bitMask;
-
-    /** The image data array. */
-    byte[]        data;
-
-    /** 8 minus the pixel bit stride. */
-    int shiftOffset;
-
-    int type;
-
-    /** A cached copy of minX + width for use in bounds checks. */
-    private int maxX;
-
-    /** A cached copy of minY + height for use in bounds checks. */
-    private int maxY;
-
-    /**
-     * Constructs a BytePackedRaster with the given SampleModel.
-     * The Raster's upper left corner is origin and it is the same
-     * size as the SampleModel.  A DataBuffer large enough to describe the
-     * Raster is automatically created.  SampleModel must be of type
-     * MultiPixelPackedSampleModel.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param origin          The Point that specified the origin.
-     */
-    public BytePackedRaster(SampleModel sampleModel,
-                            Point origin) {
-        this(sampleModel,
-             sampleModel.createDataBuffer(),
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a BytePackedRaster with the given SampleModel
-     * and DataBuffer.  The Raster's upper left corner is origin and
-     * it is the same size as the SampleModel.  The DataBuffer is not
-     * initialized and must be a DataBufferByte compatible with SampleModel.
-     * SampleModel must be of type MultiPixelPackedSampleModel.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferShort that contains the image data.
-     * @param origin          The Point that specifies the origin.
-     */
-    public BytePackedRaster(SampleModel sampleModel,
-                            DataBuffer dataBuffer,
-                            Point origin) {
-        this(sampleModel,
-             dataBuffer,
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a BytePackedRaster with the given SampleModel,
-     * DataBuffer, and parent.  DataBuffer must be a DataBufferByte and
-     * SampleModel must be of type MultiPixelPackedSampleModel.
-     * When translated into the base Raster's
-     * coordinate system, aRegion must be contained by the base Raster.
-     * Origin is the coordinate in the new Raster's coordinate system of
-     * the origin of the base Raster.  (The base Raster is the Raster's
-     * ancestor which has no parent.)
-     *
-     * Note that this constructor should generally be called by other
-     * constructors or create methods, it should not be used directly.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferShort that contains the image data.
-     * @param aRegion         The Rectangle that specifies the image area.
-     * @param origin          The Point that specifies the origin.
-     * @param parent          The parent (if any) of this raster.
-     *
-     * @exception RasterFormatException if the parameters do not conform
-     * to requirements of this Raster type.
-     */
-    public BytePackedRaster(SampleModel sampleModel,
-                            DataBuffer dataBuffer,
-                            Rectangle aRegion,
-                            Point origin,
-                            BytePackedRaster parent){
-        super(sampleModel,dataBuffer,aRegion,origin, parent);
-        this.maxX = minX + width;
-        this.maxY = minY + height;
-
-        if (!(dataBuffer instanceof DataBufferByte)) {
-           throw new RasterFormatException("BytePackedRasters must have" +
-                "byte DataBuffers");
-        }
-        DataBufferByte dbb = (DataBufferByte)dataBuffer;
-        this.data = stealData(dbb, 0);
-        if (dbb.getNumBanks() != 1) {
-            throw new
-                RasterFormatException("DataBuffer for BytePackedRasters"+
-                                      " must only have 1 bank.");
-        }
-        int dbOffset = dbb.getOffset();
-
-        if (sampleModel instanceof MultiPixelPackedSampleModel) {
-            MultiPixelPackedSampleModel mppsm =
-                (MultiPixelPackedSampleModel)sampleModel;
-            this.type = IntegerComponentRaster.TYPE_BYTE_BINARY_SAMPLES;
-            pixelBitStride = mppsm.getPixelBitStride();
-            if (pixelBitStride != 1 &&
-                pixelBitStride != 2 &&
-                pixelBitStride != 4) {
-                throw new RasterFormatException
-                  ("BytePackedRasters must have a bit depth of 1, 2, or 4");
-            }
-            scanlineStride = mppsm.getScanlineStride();
-            dataBitOffset = mppsm.getDataBitOffset() + dbOffset*8;
-            int xOffset = aRegion.x - origin.x;
-            int yOffset = aRegion.y - origin.y;
-            dataBitOffset += xOffset*pixelBitStride + yOffset*scanlineStride*8;
-            bitMask = (1 << pixelBitStride) -1;
-            shiftOffset = 8 - pixelBitStride;
-        } else {
-            throw new RasterFormatException("BytePackedRasters must have"+
-                "MultiPixelPackedSampleModel");
-        }
-        verify(false);
-    }
-
-    /**
-     * Returns the data bit offset for the Raster.  The data
-     * bit offset is the bit index into the data array element
-     * corresponding to the first sample of the first scanline.
-     */
-    public int getDataBitOffset() {
-        return dataBitOffset;
-    }
-
-    /**
-     * Returns the scanline stride -- the number of data array elements between
-     * a given sample and the sample in the same column
-     * of the next row.
-     */
-    public int getScanlineStride() {
-        return scanlineStride;
-    }
-
-    /**
-     * Returns pixel bit stride -- the number of bits between two
-     * samples on the same scanline.
-     */
-    public int getPixelBitStride() {
-        return pixelBitStride;
-    }
-
-    /**
-     * Returns a reference to the entire data array.
-     */
-    public byte[] getDataStorage() {
-        return data;
-    }
-
-    /**
-     * Returns the data element at the specified
-     * location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte outData[];
-        if (obj == null) {
-            outData = new byte[numDataElements];
-        } else {
-            outData = (byte[])obj;
-        }
-        int bitnum = dataBitOffset + (x-minX) * pixelBitStride;
-        // Fix 4184283
-        int element = data[(y-minY) * scanlineStride + (bitnum >> 3)] & 0xff;
-        int shift = shiftOffset - (bitnum & 7);
-        outData[0] = (byte)((element >> shift) & bitMask);
-        return outData;
-    }
-
-    /**
-     * Returns the pixel data for the specified rectangle of pixels in a
-     * primitive array of type TransferType.
-     * For image data supported by the Java 2D API, this
-     * will be one of DataBuffer.TYPE_BYTE, DataBuffer.TYPE_USHORT, or
-     * DataBuffer.TYPE_INT.  Data may be returned in a packed format,
-     * thus increasing efficiency for data transfers.
-     *
-     * An ArrayIndexOutOfBoundsException may be thrown
-     * if the coordinates are not in bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of TransferType.
-     * @see java.awt.image.SampleModel#getDataElements(int, int, int, int, Object, DataBuffer)
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements().
-     *                 If null, an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the requested pixel data.
-     */
-    public Object getDataElements(int x, int y, int w, int h,
-                                  Object outData) {
-        return getByteData(x, y, w, h, (byte[])outData);
-    }
-
-    /**
-     * Returns an array  of data elements from the specified rectangular
-     * region.
-     *
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * <pre>
-     *       byte[] bandData = (byte[])raster.getPixelData(x, y, w, h, null);
-     *       int pixel;
-     *       // To find a data element at location (x2, y2)
-     *       pixel = bandData[((y2-y)*w + (x2-x))];
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getPixelData(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte outData[];
-        if (obj == null) {
-            outData = new byte[numDataElements*w*h];
-        } else {
-            outData = (byte[])obj;
-        }
-        int pixbits = pixelBitStride;
-        int scanbit = dataBitOffset + (x-minX) * pixbits;
-        int index = (y-minY) * scanlineStride;
-        int outindex = 0;
-        byte data[] = this.data;
-
-        for (int j = 0; j < h; j++) {
-            int bitnum = scanbit;
-            for (int i = 0; i < w; i++) {
-                int shift = shiftOffset - (bitnum & 7);
-                outData[outindex++] =
-                    (byte)(bitMask & (data[index + (bitnum >> 3)] >> shift));
-                bitnum += pixbits;
-            }
-            index += scanlineStride;
-        }
-        return outData;
-    }
-
-    /**
-     * Returns a byte array containing the specified data elements
-     * from the data array.  The band index will be ignored.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * <pre>
-     *       byte[] byteData = getByteData(x, y, band, w, h, null);
-     *       // To find a data element at location (x2, y2)
-     *       byte element = byteData[(y2-y)*w + (x2-x)];
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param band     The band to return, is ignored.
-     * @param outData  If non-null, data elements
-     *                 at the specified locations are returned in this array.
-     * @return         Byte array with data elements.
-     */
-    public byte[] getByteData(int x, int y, int w, int h,
-                              int band, byte[] outData) {
-        return getByteData(x, y, w, h, outData);
-    }
-
-    /**
-     * Returns a byte array containing the specified data elements
-     * from the data array.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * <pre>
-     *       byte[] byteData = raster.getByteData(x, y, w, h, null);
-     *       byte pixel;
-     *       // To find a data element at location (x2, y2)
-     *       pixel = byteData[((y2-y)*w + (x2-x))];
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  If non-null, data elements
-     *                 at the specified locations are returned in this array.
-     * @return         Byte array with data elements.
-     */
-    public byte[] getByteData(int x, int y, int w, int h, byte[] outData) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (outData == null) {
-            outData = new byte[w * h];
-        }
-        int pixbits = pixelBitStride;
-        int scanbit = dataBitOffset + (x-minX) * pixbits;
-        int index = (y-minY) * scanlineStride;
-        int outindex = 0;
-        byte data[] = this.data;
-
-        for (int j = 0; j < h; j++) {
-            int bitnum = scanbit;
-            int element;
-
-            // Process initial portion of scanline
-            int i = 0;
-            while ((i < w) && ((bitnum & 7) != 0)) {
-                int shift = shiftOffset - (bitnum & 7);
-                outData[outindex++] =
-                    (byte)(bitMask & (data[index + (bitnum >> 3)] >> shift));
-                bitnum += pixbits;
-                i++;
-            }
-
-            // Process central portion of scanline 8 pixels at a time
-            int inIndex = index + (bitnum >> 3);
-            switch (pixbits) {
-            case 1:
-                for (; i < w - 7; i += 8) {
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 7) & 1);
-                    outData[outindex++] = (byte)((element >> 6) & 1);
-                    outData[outindex++] = (byte)((element >> 5) & 1);
-                    outData[outindex++] = (byte)((element >> 4) & 1);
-                    outData[outindex++] = (byte)((element >> 3) & 1);
-                    outData[outindex++] = (byte)((element >> 2) & 1);
-                    outData[outindex++] = (byte)((element >> 1) & 1);
-                    outData[outindex++] = (byte)(element & 1);
-                    bitnum += 8;
-                }
-                break;
-
-            case 2:
-                for (; i < w - 7; i += 8) {
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 6) & 3);
-                    outData[outindex++] = (byte)((element >> 4) & 3);
-                    outData[outindex++] = (byte)((element >> 2) & 3);
-                    outData[outindex++] = (byte)(element & 3);
-
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 6) & 3);
-                    outData[outindex++] = (byte)((element >> 4) & 3);
-                    outData[outindex++] = (byte)((element >> 2) & 3);
-                    outData[outindex++] = (byte)(element & 3);
-
-                    bitnum += 16;
-                }
-                break;
-
-            case 4:
-                for (; i < w - 7; i += 8) {
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 4) & 0xf);
-                    outData[outindex++] = (byte)(element & 0xf);
-
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 4) & 0xf);
-                    outData[outindex++] = (byte)(element & 0xf);
-
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 4) & 0xf);
-                    outData[outindex++] = (byte)(element & 0xf);
-
-                    element = data[inIndex++];
-                    outData[outindex++] = (byte)((element >> 4) & 0xf);
-                    outData[outindex++] = (byte)(element & 0xf);
-
-                    bitnum += 32;
-                }
-                break;
-            }
-
-            // Process final portion of scanline
-            for (; i < w; i++) {
-                int shift = shiftOffset - (bitnum & 7);
-                outData[outindex++] =
-                    (byte) (bitMask & (data[index + (bitnum >> 3)] >> shift));
-                bitnum += pixbits;
-            }
-
-            index += scanlineStride;
-        }
-
-        return outData;
-    }
-
-    /**
-     * Stores the data elements at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements()
-     *                 containing the pixel data to place at x,y.
-     */
-    public void setDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        byte inData[] = (byte[])obj;
-        int bitnum = dataBitOffset + (x-minX) * pixelBitStride;
-        int index = (y-minY) * scanlineStride + (bitnum >> 3);
-        int shift = shiftOffset - (bitnum & 7);
-
-        byte element = data[index];
-        element &= ~(bitMask << shift);
-        element |= (inData[0] & bitMask) << shift;
-        data[index] = element;
-
-        markDirty();
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * @param x          The X coordinate of the pixel location.
-     * @param y          The Y coordinate of the pixel location.
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    public void setDataElements(int x, int y, Raster inRaster) {
-        // Check if we can use fast code
-        if (!(inRaster instanceof BytePackedRaster) ||
-            ((BytePackedRaster)inRaster).pixelBitStride != pixelBitStride) {
-            super.setDataElements(x, y, inRaster);
-            return;
-        }
-
-        int srcOffX = inRaster.getMinX();
-        int srcOffY = inRaster.getMinY();
-        int dstOffX = srcOffX + x;
-        int dstOffY = srcOffY + y;
-        int width = inRaster.getWidth();
-        int height = inRaster.getHeight();
-        if ((dstOffX < this.minX) || (dstOffY < this.minY) ||
-            (dstOffX + width > this.maxX) || (dstOffY + height > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        setDataElements(dstOffX, dstOffY,
-                        srcOffX, srcOffY,
-                        width, height,
-                        (BytePackedRaster)inRaster);
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * @param dstX The absolute X coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param dstY The absolute Y coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param srcX The absolute X coordinate of the upper-left source
-     * pixel that will be copied into this Raster
-     * @param srcY The absolute Y coordinate of the upper-left source
-     * pixel that will be copied into this Raster
-     * @param width      The number of pixels to store horizontally
-     * @param height     The number of pixels to store vertically
-     * @param inRaster   BytePackedRaster of data to place at x,y location.
-     */
-    private void setDataElements(int dstX, int dstY,
-                                 int srcX, int srcY,
-                                 int width, int height,
-                                 BytePackedRaster inRaster) {
-        // Assume bounds checking has been performed previously
-        if (width <= 0 || height <= 0) {
-            return;
-        }
-
-        byte[] inData = inRaster.data;
-        byte[] outData = this.data;
-
-        int inscan = inRaster.scanlineStride;
-        int outscan = this.scanlineStride;
-        int inbit = inRaster.dataBitOffset +
-                      8 * (srcY - inRaster.minY) * inscan +
-                      (srcX - inRaster.minX) * inRaster.pixelBitStride;
-        int outbit = (this.dataBitOffset +
-                      8 * (dstY - minY) * outscan +
-                      (dstX - minX) * this.pixelBitStride);
-        int copybits = width * pixelBitStride;
-
-        // Check whether the same bit alignment is present in both
-        // Rasters; if so, we can copy whole bytes using
-        // System.arraycopy.  If not, we must do a "funnel shift"
-        // where adjacent bytes contribute to each destination byte.
-        if ((inbit & 7) == (outbit & 7)) {
-            // copy is bit aligned
-            int bitpos = outbit & 7;
-            if (bitpos != 0) {
-                int bits = 8 - bitpos;
-                // Copy partial bytes on left
-                int inbyte = inbit >> 3;
-                int outbyte = outbit >> 3;
-                int mask = 0xff >> bitpos;
-                if (copybits < bits) {
-                    // Fix bug 4399076: previously had '8 - copybits' instead
-                    // of 'bits - copybits'.
-                    //
-                    // Prior to the this expression, 'mask' has its rightmost
-                    // 'bits' bits set to '1'.  We want it to have a total
-                    // of 'copybits' bits set, therefore we want to introduce
-                    // 'bits - copybits' zeroes on the right.
-                    mask &= 0xff << (bits - copybits);
-                    bits = copybits;
-                }
-                for (int j = 0; j < height; j++) {
-                    int element = outData[outbyte];
-                    element &= ~mask;
-                    element |= (inData[inbyte] & mask);
-                    outData[outbyte] = (byte) element;
-                    inbyte += inscan;
-                    outbyte += outscan;
-                }
-                inbit += bits;
-                outbit += bits;
-                copybits -= bits;
-            }
-            if (copybits >= 8) {
-                // Copy whole bytes
-                int inbyte = inbit >> 3;
-                int outbyte = outbit >> 3;
-                int copybytes = copybits >> 3;
-                if (copybytes == inscan && inscan == outscan) {
-                    System.arraycopy(inData, inbyte,
-                                     outData, outbyte,
-                                     inscan * height);
-                } else {
-                    for (int j = 0; j < height; j++) {
-                        System.arraycopy(inData, inbyte,
-                                         outData, outbyte,
-                                         copybytes);
-                        inbyte += inscan;
-                        outbyte += outscan;
-                    }
-                }
-
-                int bits = copybytes*8;
-                inbit += bits;
-                outbit += bits;
-                copybits -= bits;
-            }
-            if (copybits > 0) {
-                // Copy partial bytes on right
-                int inbyte = inbit >> 3;
-                int outbyte = outbit >> 3;
-                int mask = (0xff00 >> copybits) & 0xff;
-                for (int j = 0; j < height; j++) {
-                    int element = outData[outbyte];
-                    element &= ~mask;
-                    element |= (inData[inbyte] & mask);
-                    outData[outbyte] = (byte) element;
-                    inbyte += inscan;
-                    outbyte += outscan;
-                }
-            }
-        } else {
-            // Unaligned case, see RFE #4284166
-            // Note that the code in that RFE is not correct
-
-            // Insert bits into the first byte of the output
-            // if either the starting bit position is not zero or
-            // we are writing fewer than 8 bits in total
-            int bitpos = outbit & 7;
-            if (bitpos != 0 || copybits < 8) {
-                int bits = 8 - bitpos;
-                int inbyte = inbit >> 3;
-                int outbyte = outbit >> 3;
-
-                int lshift = inbit & 7;
-                int rshift = 8 - lshift;
-                int mask = 0xff >> bitpos;
-                if (copybits < bits) {
-                    // Fix mask if we're only writing a partial byte
-                    mask &= 0xff << (bits - copybits);
-                    bits = copybits;
-                }
-                int lastByte = inData.length - 1;
-                for (int j = 0; j < height; j++) {
-                    // Read two bytes from the source if possible
-                    // Don't worry about going over a scanline boundary
-                    // since any extra bits won't get used anyway
-                    byte inData0 = inData[inbyte];
-                    byte inData1 = (byte)0;
-                    if (inbyte < lastByte) {
-                        inData1 = inData[inbyte + 1];
-                    }
-
-                    // Insert the new bits into the output
-                    int element = outData[outbyte];
-                    element &= ~mask;
-                    element |= (((inData0 << lshift) |
-                                 ((inData1 & 0xff) >> rshift))
-                                >> bitpos) & mask;
-                    outData[outbyte] = (byte)element;
-                    inbyte += inscan;
-                    outbyte += outscan;
-                }
-
-                inbit += bits;
-                outbit += bits;
-                copybits -= bits;
-            }
-
-            // Now we have outbit & 7 == 0 so we can write
-            // complete bytes for a while
-
-            // Make sure we have work to do in the central loop
-            // to avoid reading past the end of the scanline
-            if (copybits >= 8) {
-                int inbyte = inbit >> 3;
-                int outbyte = outbit >> 3;
-                int copybytes = copybits >> 3;
-                int lshift = inbit & 7;
-                int rshift = 8 - lshift;
-
-                for (int j = 0; j < height; j++) {
-                    int ibyte = inbyte + j*inscan;
-                    int obyte = outbyte + j*outscan;
-
-                    int inData0 = inData[ibyte];
-                    // Combine adjacent bytes while 8 or more bits left
-                    for (int i = 0; i < copybytes; i++) {
-                        int inData1 = inData[ibyte + 1];
-                        int val = (inData0 << lshift) |
-                            ((inData1 & 0xff) >> rshift);
-                        outData[obyte] = (byte)val;
-                        inData0 = inData1;
-
-                        ++ibyte;
-                        ++obyte;
-                    }
-                }
-
-                int bits = copybytes*8;
-                inbit += bits;
-                outbit += bits;
-                copybits -= bits;
-            }
-
-            // Finish last byte
-            if (copybits > 0) {
-                int inbyte = inbit >> 3;
-                int outbyte = outbit >> 3;
-                int mask = (0xff00 >> copybits) & 0xff;
-                int lshift = inbit & 7;
-                int rshift = 8 - lshift;
-
-                int lastByte = inData.length - 1;
-                for (int j = 0; j < height; j++) {
-                    byte inData0 = inData[inbyte];
-                    byte inData1 = (byte)0;
-                    if (inbyte < lastByte) {
-                        inData1 = inData[inbyte + 1];
-                    }
-
-                    // Insert the new bits into the output
-                    int element = outData[outbyte];
-                    element &= ~mask;
-                    element |= ((inData0 << lshift) |
-                                ((inData1 & 0xff) >> rshift)) & mask;
-                    outData[outbyte] = (byte)element;
-
-                    inbyte += inscan;
-                    outbyte += outscan;
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Copies pixels from Raster srcRaster to this WritableRaster.
-     * For each (x, y) address in srcRaster, the corresponding pixel
-     * is copied to address (x+dx, y+dy) in this WritableRaster,
-     * unless (x+dx, y+dy) falls outside the bounds of this raster.
-     * srcRaster must have the same number of bands as this WritableRaster.
-     * The copy is a simple copy of source samples to the corresponding
-     * destination samples.  For details, see
-     * {@link WritableRaster#setRect(Raster)}.
-     *
-     * @param dx        The X translation factor from src space to dst space
-     *                  of the copy.
-     * @param dy        The Y translation factor from src space to dst space
-     *                  of the copy.
-     * @param srcRaster The Raster from which to copy pixels.
-     */
-    public void setRect(int dx, int dy, Raster srcRaster) {
-        // Check if we can use fast code
-        if (!(srcRaster instanceof BytePackedRaster) ||
-            ((BytePackedRaster)srcRaster).pixelBitStride != pixelBitStride) {
-            super.setRect(dx, dy, srcRaster);
-            return;
-        }
-
-        int width  = srcRaster.getWidth();
-        int height = srcRaster.getHeight();
-        int srcOffX = srcRaster.getMinX();
-        int srcOffY = srcRaster.getMinY();
-        int dstOffX = dx+srcOffX;
-        int dstOffY = dy+srcOffY;
-
-        // Clip to this raster
-        if (dstOffX < this.minX) {
-            int skipX = this.minX - dstOffX;
-            width -= skipX;
-            srcOffX += skipX;
-            dstOffX = this.minX;
-        }
-        if (dstOffY < this.minY) {
-            int skipY = this.minY - dstOffY;
-            height -= skipY;
-            srcOffY += skipY;
-            dstOffY = this.minY;
-        }
-        if (dstOffX+width > this.maxX) {
-            width = this.maxX - dstOffX;
-        }
-        if (dstOffY+height > this.maxY) {
-            height = this.maxY - dstOffY;
-        }
-
-        setDataElements(dstOffX, dstOffY,
-                        srcOffX, srcOffY,
-                        width, height,
-                        (BytePackedRaster)srcRaster);
-    }
-
-    /**
-     * Stores an array of data elements into the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements()
-     *                 containing the pixel data to place between x,y and
-     *                 x+h, y+h.
-     */
-    public void setDataElements(int x, int y, int w, int h, Object obj) {
-        putByteData(x, y, w, h, (byte[])obj);
-    }
-
-    /**
-     * Stores a byte array of data elements into the specified rectangular
-     * region.  The band index will be ignored.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param band     The band to set, is ignored.
-     * @param inData   The data elements to be stored.
-     */
-    public void putByteData(int x, int y, int w, int h,
-                            int band, byte[] inData) {
-        putByteData(x, y, w, h, inData);
-    }
-
-    /**
-     * Stores a byte array of data elements into the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   The data elements to be stored.
-     */
-    public void putByteData(int x, int y, int w, int h, byte[] inData) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (w == 0 || h == 0) {
-            return;
-        }
-
-        int pixbits = pixelBitStride;
-        int scanbit = dataBitOffset + (x - minX) * pixbits;
-        int index = (y - minY) * scanlineStride;
-        int outindex = 0;
-        byte data[] = this.data;
-        for (int j = 0; j < h; j++) {
-            int bitnum = scanbit;
-            int element;
-
-            // Process initial portion of scanline
-            int i = 0;
-            while ((i < w) && ((bitnum & 7) != 0)) {
-                int shift = shiftOffset - (bitnum & 7);
-                element = data[index + (bitnum >> 3)];
-                element &= ~(bitMask << shift);
-                element |= (inData[outindex++] & bitMask) << shift;
-                data[index + (bitnum >> 3)] = (byte)element;
-
-                bitnum += pixbits;
-                i++;
-            }
-
-            // Process central portion of scanline 8 pixels at a time
-            int inIndex = index + (bitnum >> 3);
-            switch (pixbits) {
-            case 1:
-                for (; i < w - 7; i += 8) {
-                    element = (inData[outindex++] & 1) << 7;
-                    element |= (inData[outindex++] & 1) << 6;
-                    element |= (inData[outindex++] & 1) << 5;
-                    element |= (inData[outindex++] & 1) << 4;
-                    element |= (inData[outindex++] & 1) << 3;
-                    element |= (inData[outindex++] & 1) << 2;
-                    element |= (inData[outindex++] & 1) << 1;
-                    element |= (inData[outindex++] & 1);
-
-                    data[inIndex++] = (byte)element;
-
-                    bitnum += 8;
-                }
-                break;
-
-            case 2:
-                for (; i < w - 7; i += 8) {
-                    element = (inData[outindex++] & 3) << 6;
-                    element |= (inData[outindex++] & 3) << 4;
-                    element |= (inData[outindex++] & 3) << 2;
-                    element |= (inData[outindex++] & 3);
-                    data[inIndex++] = (byte)element;
-
-                    element = (inData[outindex++] & 3) << 6;
-                    element |= (inData[outindex++] & 3) << 4;
-                    element |= (inData[outindex++] & 3) << 2;
-                    element |= (inData[outindex++] & 3);
-                    data[inIndex++] = (byte)element;
-
-                    bitnum += 16;
-                }
-                break;
-
-            case 4:
-                for (; i < w - 7; i += 8) {
-                    element = (inData[outindex++] & 0xf) << 4;
-                    element |= (inData[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    element = (inData[outindex++] & 0xf) << 4;
-                    element |= (inData[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    element = (inData[outindex++] & 0xf) << 4;
-                    element |= (inData[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    element = (inData[outindex++] & 0xf) << 4;
-                    element |= (inData[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    bitnum += 32;
-                }
-                break;
-            }
-
-            // Process final portion of scanline
-            for (; i < w; i++) {
-                int shift = shiftOffset - (bitnum & 7);
-
-                element = data[index + (bitnum >> 3)];
-                element &= ~(bitMask << shift);
-                element |= (inData[outindex++] & bitMask) << shift;
-                data[index + (bitnum >> 3)] = (byte)element;
-
-                bitnum += pixbits;
-            }
-
-            index += scanlineStride;
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Returns an int array containing all samples for a rectangle of pixels,
-     * one sample per array element.
-     * An ArrayIndexOutOfBoundsException may be thrown
-     * if the coordinates are not in bounds.
-     * @param x,&nbsp;y   the coordinates of the upper-left pixel location
-     * @param w      Width of the pixel rectangle
-     * @param h      Height of the pixel rectangle
-     * @param iArray An optionally pre-allocated int array
-     * @return the samples for the specified rectangle of pixels.
-     */
-    public int[] getPixels(int x, int y, int w, int h, int iArray[]) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (iArray == null) {
-            iArray = new int[w * h];
-        }
-        int pixbits = pixelBitStride;
-        int scanbit = dataBitOffset + (x-minX) * pixbits;
-        int index = (y-minY) * scanlineStride;
-        int outindex = 0;
-        byte data[] = this.data;
-
-        for (int j = 0; j < h; j++) {
-            int bitnum = scanbit;
-            int element;
-
-            // Process initial portion of scanline
-            int i = 0;
-            while ((i < w) && ((bitnum & 7) != 0)) {
-                int shift = shiftOffset - (bitnum & 7);
-                iArray[outindex++] =
-                    bitMask & (data[index + (bitnum >> 3)] >> shift);
-                bitnum += pixbits;
-                i++;
-            }
-
-            // Process central portion of scanline 8 pixels at a time
-            int inIndex = index + (bitnum >> 3);
-            switch (pixbits) {
-            case 1:
-                for (; i < w - 7; i += 8) {
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 7) & 1;
-                    iArray[outindex++] = (element >> 6) & 1;
-                    iArray[outindex++] = (element >> 5) & 1;
-                    iArray[outindex++] = (element >> 4) & 1;
-                    iArray[outindex++] = (element >> 3) & 1;
-                    iArray[outindex++] = (element >> 2) & 1;
-                    iArray[outindex++] = (element >> 1) & 1;
-                    iArray[outindex++] = element & 1;
-                    bitnum += 8;
-                }
-                break;
-
-            case 2:
-                for (; i < w - 7; i += 8) {
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 6) & 3;
-                    iArray[outindex++] = (element >> 4) & 3;
-                    iArray[outindex++] = (element >> 2) & 3;
-                    iArray[outindex++] = element & 3;
-
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 6) & 3;
-                    iArray[outindex++] = (element >> 4) & 3;
-                    iArray[outindex++] = (element >> 2) & 3;
-                    iArray[outindex++] = element & 3;
-
-                    bitnum += 16;
-                }
-                break;
-
-            case 4:
-                for (; i < w - 7; i += 8) {
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 4) & 0xf;
-                    iArray[outindex++] = element & 0xf;
-
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 4) & 0xf;
-                    iArray[outindex++] = element & 0xf;
-
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 4) & 0xf;
-                    iArray[outindex++] = element & 0xf;
-
-                    element = data[inIndex++];
-                    iArray[outindex++] = (element >> 4) & 0xf;
-                    iArray[outindex++] = element & 0xf;
-
-                    bitnum += 32;
-                }
-                break;
-            }
-
-            // Process final portion of scanline
-            for (; i < w; i++) {
-                int shift = shiftOffset - (bitnum & 7);
-                iArray[outindex++] =
-                    bitMask & (data[index + (bitnum >> 3)] >> shift);
-                bitnum += pixbits;
-            }
-
-            index += scanlineStride;
-        }
-
-        return iArray;
-    }
-
-    /**
-     * Sets all samples for a rectangle of pixels from an int array containing
-     * one sample per array element.
-     * An ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param iArray   The input int pixel array.
-     */
-    public void setPixels(int x, int y, int w, int h, int iArray[]) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int pixbits = pixelBitStride;
-        int scanbit = dataBitOffset + (x - minX) * pixbits;
-        int index = (y - minY) * scanlineStride;
-        int outindex = 0;
-        byte data[] = this.data;
-        for (int j = 0; j < h; j++) {
-            int bitnum = scanbit;
-            int element;
-
-            // Process initial portion of scanline
-            int i = 0;
-            while ((i < w) && ((bitnum & 7) != 0)) {
-                int shift = shiftOffset - (bitnum & 7);
-                element = data[index + (bitnum >> 3)];
-                element &= ~(bitMask << shift);
-                element |= (iArray[outindex++] & bitMask) << shift;
-                data[index + (bitnum >> 3)] = (byte)element;
-
-                bitnum += pixbits;
-                i++;
-            }
-
-            // Process central portion of scanline 8 pixels at a time
-            int inIndex = index + (bitnum >> 3);
-            switch (pixbits) {
-            case 1:
-                for (; i < w - 7; i += 8) {
-                    element = (iArray[outindex++] & 1) << 7;
-                    element |= (iArray[outindex++] & 1) << 6;
-                    element |= (iArray[outindex++] & 1) << 5;
-                    element |= (iArray[outindex++] & 1) << 4;
-                    element |= (iArray[outindex++] & 1) << 3;
-                    element |= (iArray[outindex++] & 1) << 2;
-                    element |= (iArray[outindex++] & 1) << 1;
-                    element |= (iArray[outindex++] & 1);
-                    data[inIndex++] = (byte)element;
-
-                    bitnum += 8;
-                }
-                break;
-
-            case 2:
-                for (; i < w - 7; i += 8) {
-                    element = (iArray[outindex++] & 3) << 6;
-                    element |= (iArray[outindex++] & 3) << 4;
-                    element |= (iArray[outindex++] & 3) << 2;
-                    element |= (iArray[outindex++] & 3);
-                    data[inIndex++] = (byte)element;
-
-                    element = (iArray[outindex++] & 3) << 6;
-                    element |= (iArray[outindex++] & 3) << 4;
-                    element |= (iArray[outindex++] & 3) << 2;
-                    element |= (iArray[outindex++] & 3);
-                    data[inIndex++] = (byte)element;
-
-                    bitnum += 16;
-                }
-                break;
-
-            case 4:
-                for (; i < w - 7; i += 8) {
-                    element = (iArray[outindex++] & 0xf) << 4;
-                    element |= (iArray[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    element = (iArray[outindex++] & 0xf) << 4;
-                    element |= (iArray[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    element = (iArray[outindex++] & 0xf) << 4;
-                    element |= (iArray[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    element = (iArray[outindex++] & 0xf) << 4;
-                    element |= (iArray[outindex++] & 0xf);
-                    data[inIndex++] = (byte)element;
-
-                    bitnum += 32;
-                }
-                break;
-            }
-
-            // Process final portion of scanline
-            for (; i < w; i++) {
-                int shift = shiftOffset - (bitnum & 7);
-
-                element = data[index + (bitnum >> 3)];
-                element &= ~(bitMask << shift);
-                element |= (iArray[outindex++] & bitMask) << shift;
-                data[index + (bitnum >> 3)] = (byte)element;
-
-                bitnum += pixbits;
-            }
-
-            index += scanlineStride;
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Creates a subraster given a region of the raster.  The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this raster to the upper-left corner
-     * of the subraster.  Note that the subraster will reference the same
-     * DataBuffer as the parent raster, but using different offsets. The
-     * bandList is ignored.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent raster.
-     */
-    public Raster createChild(int x, int y,
-                              int width, int height,
-                              int x0, int y0, int[] bandList) {
-        WritableRaster newRaster = createWritableChild(x, y,
-                                                       width, height,
-                                                       x0, y0,
-                                                       bandList);
-        return (Raster) newRaster;
-    }
-
-    /**
-     * Creates a Writable subRaster given a region of the Raster. The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this Raster to the upper-left corner
-     * of the subRaster.  The bandList is ignored.
-     * A translation to the subRaster may also be specified.
-     * Note that the subRaster will reference the same
-     * DataBuffer as the parent Raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent Raster.
-     */
-    public WritableRaster createWritableChild(int x, int y,
-                                              int width, int height,
-                                              int x0, int y0,
-                                              int[] bandList) {
-        if (x < this.minX) {
-            throw new RasterFormatException("x lies outside the raster");
-        }
-        if (y < this.minY) {
-            throw new RasterFormatException("y lies outside the raster");
-        }
-        if ((x+width < x) || (x+width > this.minX + this.width)) {
-            throw new RasterFormatException("(x + width) is outside of Raster");
-        }
-        if ((y+height < y) || (y+height > this.minY + this.height)) {
-            throw new RasterFormatException("(y + height) is outside of Raster");
-        }
-
-        SampleModel sm;
-
-        if (bandList != null) {
-            sm = sampleModel.createSubsetSampleModel(bandList);
-        }
-        else {
-            sm = sampleModel;
-        }
-
-        int deltaX = x0 - x;
-        int deltaY = y0 - y;
-
-        return new BytePackedRaster(sm,
-                                    dataBuffer,
-                                    new Rectangle(x0, y0, width, height),
-                                    new Point(sampleModelTranslateX+deltaX,
-                                              sampleModelTranslateY+deltaY),
-                                    this);
-    }
-
-    /**
-     * Creates a raster with the same layout but using a different
-     * width and height, and with new zeroed data arrays.
-     */
-    public WritableRaster createCompatibleWritableRaster(int w, int h) {
-        if (w <= 0 || h <=0) {
-            throw new RasterFormatException("negative "+
-                                          ((w <= 0) ? "width" : "height"));
-        }
-
-        SampleModel sm = sampleModel.createCompatibleSampleModel(w,h);
-
-        return new BytePackedRaster(sm, new Point(0,0));
-    }
-
-    /**
-     * Creates a raster with the same layout and the same
-     * width and height, and with new zeroed data arrays.
-     */
-    public WritableRaster createCompatibleWritableRaster () {
-        return createCompatibleWritableRaster(width,height);
-    }
-
-    /**
-     * Verify that the layout parameters are consistent with
-     * the data.  If strictCheck
-     * is false, this method will check for ArrayIndexOutOfBounds conditions.
-     * If strictCheck is true, this method will check for additional error
-     * conditions such as line wraparound (width of a line greater than
-     * the scanline stride).
-     * @return   String   Error string, if the layout is incompatible with
-     *                    the data.  Otherwise returns null.
-     */
-    private void verify (boolean strictCheck) {
-        // Make sure data for Raster is in a legal range
-        if (dataBitOffset < 0) {
-            throw new RasterFormatException("Data offsets must be >= 0");
-        }
-
-        /* Need to re-verify the dimensions since a sample model may be
-         * specified to the constructor
-         */
-        if (width <= 0 || height <= 0 ||
-            height > (Integer.MAX_VALUE / width))
-        {
-            throw new RasterFormatException("Invalid raster dimension");
-        }
-
-
-        /*
-         * pixelBitstride was verified in constructor, so just make
-         * sure that it is safe to multiply it by width.
-         */
-        if ((width - 1) > Integer.MAX_VALUE / pixelBitStride) {
-            throw new RasterFormatException("Invalid raster dimension");
-        }
-
-        if (scanlineStride < 0 ||
-            scanlineStride > (Integer.MAX_VALUE / height) ||
-            scanlineStride > data.length)
-        {
-            throw new RasterFormatException("Invalid scanline stride");
-        }
-
-        int lastbit = (dataBitOffset
-                       + (height-1) * scanlineStride * 8
-                       + (width-1) * pixelBitStride
-                       + pixelBitStride - 1);
-        if (lastbit < 0 || lastbit / 8 >= data.length) {
-            throw new RasterFormatException("raster dimensions overflow " +
-                                            "array bounds");
-        }
-        if (strictCheck) {
-            if (height > 1) {
-                lastbit = width * pixelBitStride - 1;
-                if (lastbit / 8 >= scanlineStride) {
-                    throw new RasterFormatException("data for adjacent" +
-                                                    " scanlines overlaps");
-                }
-            }
-        }
-    }
-
-    public String toString() {
-        return new String ("BytePackedRaster: width = "+width+" height = "+height
-                           +" #channels "+numBands
-                           +" xOff = "+sampleModelTranslateX
-                           +" yOff = "+sampleModelTranslateY);
-    }
-}
diff --git a/openjdk/sun/awt/image/IntegerComponentRaster.java b/openjdk/sun/awt/image/IntegerComponentRaster.java
deleted file mode 100644
index 48d6f920..00000000
--- a/openjdk/sun/awt/image/IntegerComponentRaster.java
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.RasterFormatException;
-import java.awt.image.SampleModel;
-import java.awt.image.SinglePixelPackedSampleModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferInt;
-import java.awt.Rectangle;
-import java.awt.Point;
-
-/**
- * This class defines a Raster with pixels consisting of one or more 32-bit
- * data elements stored in close proximity to each other in a integer array.
- * The bit precision per data element is that
- * of the data type (that is, the bit precision for this raster is 32).
- * There is only one pixel stride and one scanline stride for all
- * bands.  For a given pixel, all samples fit in N data elements and these
- * N data elements hold samples for only one pixel.  This type of Raster
- * can be used with a PackedColorModel.
- * <p>
- * For example, if there is only one data element per pixel, a
- * SinglePixelPackedSampleModel can be used to represent multiple
- * bands with a PackedColorModel (including a DirectColorModel) for
- * color interpretation.
- *
- */
-public class IntegerComponentRaster extends SunWritableRaster {
-
-    static final int TYPE_CUSTOM                = 0;
-    static final int TYPE_BYTE_SAMPLES          = 1;
-    static final int TYPE_USHORT_SAMPLES        = 2;
-    static final int TYPE_INT_SAMPLES           = 3;
-    static final int TYPE_BYTE_BANDED_SAMPLES   = 4;
-    static final int TYPE_USHORT_BANDED_SAMPLES = 5;
-    static final int TYPE_INT_BANDED_SAMPLES    = 6;
-    static final int TYPE_BYTE_PACKED_SAMPLES   = 7;
-    static final int TYPE_USHORT_PACKED_SAMPLES = 8;
-    static final int TYPE_INT_PACKED_SAMPLES    = 9;
-    static final int TYPE_INT_8BIT_SAMPLES      = 10;
-    static final int TYPE_BYTE_BINARY_SAMPLES   = 11;
-
-    /** private band offset for use by native code */
-    protected int bandOffset;
-
-    /** Data offsets for each band of image data. */
-    protected int[]         dataOffsets;
-
-    /** Scanline stride of the image data contained in this Raster. */
-    protected int           scanlineStride;
-
-    /** Pixel stride of the image data contained in this Raster. */
-    protected int           pixelStride;
-
-    /** The image data array. */
-    protected int[]         data;
-
-    /** The number of data elements required to store a pixel. */
-    protected int           numDataElems;
-
-    int type;
-
-    /** A cached copy of minX + width for use in bounds checks. */
-    private int maxX;
-
-    /** A cached copy of minY + height for use in bounds checks. */
-    private int maxY;
-
-    /**
-     *  Constructs a IntegerComponentRaster with the given SampleModel.
-     *  The Raster's upper left corner is origin and it is the same
-     *  size as the SampleModel.  A DataBuffer large enough to describe the
-     *  Raster is automatically created.  SampleModel must be of type
-     *  SinglePixelPackedSampleModel.
-     *  @param sampleModel     The SampleModel that specifies the layout.
-     *  @param origin          The Point that specified the origin.
-     */
-    public IntegerComponentRaster(SampleModel sampleModel,
-                                     Point origin) {
-        this(sampleModel,
-             sampleModel.createDataBuffer(),
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a IntegerComponentRaster with the given SampleModel
-     * and DataBuffer.  The Raster's upper left corner is origin and
-     * it is the same sizes the SampleModel.  The DataBuffer is not
-     * initialized and must be a DataBufferInt compatible with SampleModel.
-     * SampleModel must be of type SinglePixelPackedSampleModel.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferInt that contains the image data.
-     * @param origin          The Point that specifies the origin.
-     */
-    public IntegerComponentRaster(SampleModel sampleModel,
-                                     DataBuffer dataBuffer,
-                                     Point origin) {
-        this(sampleModel,
-             dataBuffer,
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-   /**
-     * Constructs a IntegerComponentRaster with the given SampleModel,
-     * DataBuffer, and parent.  DataBuffer must be a DataBufferInt and
-     * SampleModel must be of type SinglePixelPackedSampleModel.
-     * When translated into the base Raster's
-     * coordinate system, aRegion must be contained by the base Raster.
-     * Origin is the coodinate in the new Raster's coordinate system of
-     * the origin of the base Raster.  (The base Raster is the Raster's
-     * ancestor which has no parent.)
-     *
-     * Note that this constructor should generally be called by other
-     * constructors or create methods, it should not be used directly.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferInt that contains the image data.
-     * @param aRegion         The Rectangle that specifies the image area.
-     * @param origin          The Point that specifies the origin.
-     * @param parent          The parent (if any) of this raster.
-     */
-    public IntegerComponentRaster(SampleModel sampleModel,
-                                     DataBuffer dataBuffer,
-                                     Rectangle aRegion,
-                                     Point origin,
-                                     IntegerComponentRaster parent){
-        super(sampleModel,dataBuffer,aRegion,origin,parent);
-        this.maxX = minX + width;
-        this.maxY = minY + height;
-        if (!(dataBuffer instanceof DataBufferInt)) {
-           throw new RasterFormatException("IntegerComponentRasters must have" +
-                "integer DataBuffers");
-        }
-        DataBufferInt dbi = (DataBufferInt)dataBuffer;
-        if (dbi.getNumBanks() != 1) {
-            throw new
-                RasterFormatException("DataBuffer for IntegerComponentRasters"+
-                                      " must only have 1 bank.");
-        }
-        this.data = stealData(dbi, 0);
-
-        if (sampleModel instanceof SinglePixelPackedSampleModel) {
-            SinglePixelPackedSampleModel sppsm =
-                    (SinglePixelPackedSampleModel)sampleModel;
-            int[] boffsets = sppsm.getBitOffsets();
-            boolean notByteBoundary = false;
-            for (int i=1; i < boffsets.length; i++) {
-                if ((boffsets[i]%8) != 0) {
-                    notByteBoundary = true;
-                }
-            }
-            this.type = (notByteBoundary
-                         ? IntegerComponentRaster.TYPE_INT_PACKED_SAMPLES
-                         : IntegerComponentRaster.TYPE_INT_8BIT_SAMPLES);
-
-            this.scanlineStride = sppsm.getScanlineStride();
-            this.pixelStride    = 1;
-            this.dataOffsets = new int[1];
-            this.dataOffsets[0] = dbi.getOffset();
-            this.bandOffset = this.dataOffsets[0];
-            int xOffset = aRegion.x - origin.x;
-            int yOffset = aRegion.y - origin.y;
-            dataOffsets[0] += xOffset+yOffset*scanlineStride;
-            this.numDataElems = sppsm.getNumDataElements();
-        } else {
-            throw new RasterFormatException("IntegerComponentRasters must have"+
-                                            " SinglePixelPackedSampleModel");
-        }
-
-        verify();
-    }
-
-
-    /**
-     * Returns a copy of the data offsets array. For each band the data offset
-     * is the index into the band's data array, of the first sample of the
-     * band.
-     */
-    public int[] getDataOffsets() {
-        return (int[]) dataOffsets.clone();
-    }
-
-    /**
-     * Returns data offset for the specified band.  The data offset
-     * is the index into the data array in which the first sample
-     * of the first scanline is stored.
-     */
-    public int getDataOffset(int band) {
-        return dataOffsets[band];
-    }
-
-
-    /**
-     * Returns the scanline stride -- the number of data array elements between
-     * a given sample and the sample in the same column of the next row.
-     */
-    public int getScanlineStride() {
-        return scanlineStride;
-    }
-
-    /**
-     * Returns pixel stride -- the number of data array elements  between two
-     * samples for the same band on the same scanline.
-     */
-    public int getPixelStride() {
-        return pixelStride;
-    }
-
-    /**
-     * Returns a reference to the data array.
-     */
-    public int[] getDataStorage() {
-        return data;
-    }
-
-    /**
-     * Returns the data elements for all bands at the specified
-     * location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int outData[];
-        if (obj == null) {
-            outData = new int[numDataElements];
-        } else {
-            outData = (int[])obj;
-        }
-        int off = (y-minY)*scanlineStride +
-                  (x-minX)*pixelStride;
-        for (int band = 0; band < numDataElements; band++) {
-            outData[band] = data[dataOffsets[band] + off];
-        }
-
-        return outData;
-    }
-
-
-    /**
-     * Returns an array  of data elements from the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     <pre>
-     *       int[] bandData = (int[])raster.getDataElements(x, y, w, h, null);
-     *       int numDataElements = raster.getNumDataElements();
-     *       int[] pixel = new int[numDataElements];
-     *       // To find a data element at location (x2, y2)
-     *       System.arraycopy(bandData, ((y2-y)*w + (x2-x))*numDataElements,
-     *                        pixel, 0, numDataElements);
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int outData[];
-        if (obj instanceof int[]) {
-            outData = (int[])obj;
-        } else {
-            outData = new int[numDataElements*w*h];
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    outData[off++] = data[dataOffsets[c] + xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-
-    /**
-     * Stores the data elements for all bands at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements()
-     *                 containing the pixel data to place at x,y.
-     */
-    public void setDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int inData[] = (int[])obj;
-
-        int off = (y-minY)*scanlineStride +
-                  (x-minX)*pixelStride;
-
-        for (int i = 0; i < numDataElements; i++) {
-            data[dataOffsets[i] + off] = inData[i];
-        }
-
-        markDirty();
-    }
-
-
-    /**
-     * Stores the Raster data at the specified location.
-     * The transferType of the inputRaster must match this raster.
-     * An ArrayIndexOutOfBoundsException will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * @param x          The X coordinate of the pixel location.
-     * @param y          The Y coordinate of the pixel location.
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    public void setDataElements(int x, int y, Raster inRaster) {
-        int dstOffX = x + inRaster.getMinX();
-        int dstOffY = y + inRaster.getMinY();
-        int width  = inRaster.getWidth();
-        int height = inRaster.getHeight();
-        if ((dstOffX < this.minX) || (dstOffY < this.minY) ||
-            (dstOffX + width > this.maxX) || (dstOffY + height > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        setDataElements(dstOffX, dstOffY, width, height, inRaster);
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * @param dstX The absolute X coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param dstY The absolute Y coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param width      The number of pixels to store horizontally
-     * @param height     The number of pixels to store vertically
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    private void setDataElements(int dstX, int dstY,
-                                 int width, int height,
-                                 Raster inRaster) {
-        // Assume bounds checking has been performed previously
-        if (width <= 0 || height <= 0) {
-            return;
-        }
-
-        // Write inRaster (minX, minY) to (dstX, dstY)
-
-        int srcOffX = inRaster.getMinX();
-        int srcOffY = inRaster.getMinY();
-        int tdata[] = null;
-
-        if (inRaster instanceof IntegerComponentRaster &&
-            (pixelStride == 1) && (numDataElements == 1)) {
-            IntegerComponentRaster ict = (IntegerComponentRaster) inRaster;
-            if (ict.getNumDataElements() != 1) {
-                throw new ArrayIndexOutOfBoundsException("Number of bands"+
-                                                         " does not match");
-            }
-
-            // Extract the raster parameters
-            tdata    = ict.getDataStorage();
-            int tss  = ict.getScanlineStride();
-            int toff = ict.getDataOffset(0);
-
-            int srcOffset = toff;
-
-            int dstOffset = dataOffsets[0]+(dstY-minY)*scanlineStride+
-                                           (dstX-minX);
-
-
-            // Fastest case.  We can copy scanlines
-            if (ict.getPixelStride() == pixelStride) {
-                width *= pixelStride;
-
-                // Loop through all of the scanlines and copy the data
-                for (int startY=0; startY < height; startY++) {
-                    System.arraycopy(tdata, srcOffset, data, dstOffset, width);
-                    srcOffset += tss;
-                    dstOffset += scanlineStride;
-                }
-                markDirty();
-                return;
-            }
-        }
-
-        Object odata = null;
-        for (int startY=0; startY < height; startY++) {
-            odata = inRaster.getDataElements(srcOffX, srcOffY+startY,
-                                             width, 1, odata);
-            setDataElements(dstX, dstY+startY,
-                            width, 1, odata);
-        }
-    }
-
-    /**
-     * Stores an array of data elements into the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * for the nth band at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))*numDataElements + n]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements()
-     *                 containing the pixel data to place between x,y and
-     *                 x+h, y+h.
-     */
-    public void setDataElements(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int inData[] = (int[])obj;
-
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    data[dataOffsets[c] + xoff] = inData[off++];
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-
-    /**
-     * Creates a subraster given a region of the raster.  The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this raster to the upper-left corner
-     * of the subraster.  A subset of the bands of the parent Raster may
-     * be specified.  If this is null, then all the bands are present in the
-     * subRaster. A translation to the subRaster may also be specified.
-     * Note that the subraster will reference the same
-     * DataBuffer as the parent raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent raster.
-     */
-    public WritableRaster createWritableChild (int x, int y,
-                                               int width, int height,
-                                               int x0, int y0,
-                                               int bandList[]) {
-        if (x < this.minX) {
-            throw new RasterFormatException("x lies outside raster");
-        }
-        if (y < this.minY) {
-            throw new RasterFormatException("y lies outside raster");
-        }
-        if ((x+width < x) || (x+width > this.minX + this.width)) {
-            throw new RasterFormatException("(x + width) is outside raster");
-        }
-        if ((y+height < y) || (y+height > this.minY + this.height)) {
-            throw new RasterFormatException("(y + height) is outside raster");
-        }
-
-        SampleModel sm;
-
-        if (bandList != null)
-            sm = sampleModel.createSubsetSampleModel(bandList);
-        else
-            sm = sampleModel;
-
-        int deltaX = x0 - x;
-        int deltaY = y0 - y;
-
-        return new IntegerComponentRaster(sm,
-                                          dataBuffer,
-                                          new Rectangle(x0,y0,width,height),
-                                          new Point(sampleModelTranslateX+deltaX,
-                                                    sampleModelTranslateY+deltaY),
-                                          this);
-    }
-
-
-    /**
-     * Creates a subraster given a region of the raster.  The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this raster to the upper-left corner
-     * of the subraster.  A subset of the bands of the parent raster may
-     * be specified. If this is null, then all the bands are present in the
-     * subRaster. Note that the subraster will reference the same
-     * DataBuffer as the parent raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subRaster.
-     * @param y0              Translated Y origin of the subRaster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent raster.
-     */
-    public Raster createChild (int x, int y,
-                               int width, int height,
-                               int x0, int y0,
-                               int bandList[]) {
-        return createWritableChild(x, y, width, height, x0, y0, bandList);
-    }
-
-
-    /**
-     * Creates a raster with the same band layout but using a different
-     * width and height, and with new zeroed data arrays.
-     */
-    public WritableRaster createCompatibleWritableRaster(int w, int h) {
-        if (w <= 0 || h <=0) {
-            throw new RasterFormatException("negative "+
-                                          ((w <= 0) ? "width" : "height"));
-        }
-
-        SampleModel sm = sampleModel.createCompatibleSampleModel(w,h);
-
-        return new IntegerComponentRaster(sm, new Point(0,0));
-    }
-
-    /**
-     * Creates a raster with the same data layout and the same
-     * width and height, and with new zeroed data arrays.  If
-     * the raster is a subraster, this will call
-     * createCompatibleRaster(width, height).
-     */
-    public WritableRaster createCompatibleWritableRaster() {
-        return createCompatibleWritableRaster(width,height);
-    }
-
-    /**
-     * Verify that the layout parameters are consistent with the data.
-     *
-     * The method verifies whether scanline stride and pixel stride do not
-     * cause an integer overflow during calculation of a position of the pixel
-     * in data buffer. It also verifies whether the data buffer has enough data
-     *  to correspond the raster layout attributes.
-     *
-     * @throws RasterFormatException if an integer overflow is detected,
-     * or if data buffer has not enough capacity.
-     */
-    protected final void verify() {
-        /* Need to re-verify the dimensions since a sample model may be
-         * specified to the constructor
-         */
-        if (width <= 0 || height <= 0 ||
-            height > (Integer.MAX_VALUE / width))
-        {
-            throw new RasterFormatException("Invalid raster dimension");
-        }
-
-        if (dataOffsets[0] < 0) {
-            throw new RasterFormatException("Data offset ("+dataOffsets[0]+
-                                            ") must be >= 0");
-        }
-
-        // we can be sure that width and height are greater than 0
-        if (scanlineStride < 0 ||
-            scanlineStride > (Integer.MAX_VALUE / height) ||
-            scanlineStride > data.length)
-        {
-            // integer overflow
-            throw new RasterFormatException("Incorrect scanline stride: "
-                    + scanlineStride);
-        }
-        int lastScanOffset = (height - 1) * scanlineStride;
-
-        if (pixelStride < 0 ||
-            pixelStride > (Integer.MAX_VALUE / width) ||
-            pixelStride > data.length)
-        {
-            // integer overflow
-            throw new RasterFormatException("Incorrect pixel stride: "
-                    + pixelStride);
-        }
-        int lastPixelOffset = (width - 1) * pixelStride;
-
-        if (lastPixelOffset > (Integer.MAX_VALUE - lastScanOffset)) {
-            // integer overflow
-            throw new RasterFormatException("Incorrect raster attributes");
-        }
-        lastPixelOffset += lastScanOffset;
-
-        int index;
-        int maxIndex = 0;
-        for (int i = 0; i < numDataElements; i++) {
-            if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
-                throw new RasterFormatException("Incorrect band offset: "
-                            + dataOffsets[i]);
-            }
-
-            index = lastPixelOffset + dataOffsets[i];
-
-            if (index > maxIndex) {
-                maxIndex = index;
-            }
-        }
-        if (data.length <= maxIndex) {
-            throw new RasterFormatException("Data array too small (should be > "
-                    + maxIndex + " )");
-        }
-    }
-
-    public String toString() {
-        return new String ("IntegerComponentRaster: width = "+width
-                           +" height = " + height
-                           +" #Bands = " + numBands
-                           +" #DataElements "+numDataElements
-                           +" xOff = "+sampleModelTranslateX
-                           +" yOff = "+sampleModelTranslateY
-                           +" dataOffset[0] "+dataOffsets[0]);
-    }
-
-//    /**
-//     * For debugging...  prints a region of a one-band IntegerComponentRaster
-//     */
-//    public void print(int x, int y, int w, int h) {
-//        // REMIND:  Only works for 1 band!
-//        System.out.println(this);
-//        int offset = dataOffsets[0] + y*scanlineStride + x*pixelStride;
-//        int off;
-//        for (int yoff=0; yoff < h; yoff++, offset += scanlineStride) {
-//            off = offset;
-//            System.out.print("Line "+(sampleModelTranslateY+y+yoff)+": ");
-//            for (int xoff = 0; xoff < w; xoff++, off+= pixelStride) {
-//                System.out.print(Integer.toHexString(data[off])+" ");
-//            }
-//            System.out.println("");
-//        }
-//    }
-
-}
diff --git a/openjdk/sun/awt/image/OffScreenImageSource.java b/openjdk/sun/awt/image/OffScreenImageSource.java
deleted file mode 100644
index 7e8e2dbc..00000000
--- a/openjdk/sun/awt/image/OffScreenImageSource.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-
-import java.util.Hashtable;
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageProducer;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.ColorModel;
-import java.awt.image.IndexColorModel;
-import java.awt.image.DirectColorModel;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBuffer;
-
-public class OffScreenImageSource implements ImageProducer {
-    BufferedImage image;
-    int width;
-    int height;
-    Hashtable properties;
-
-    public OffScreenImageSource(BufferedImage image,
-                                Hashtable properties) {
-        this.image = image;
-        if (properties != null) {
-            this.properties = properties;
-        } else {
-            this.properties = new Hashtable();
-        }
-        width  = image.getWidth();
-        height = image.getHeight();
-    }
-
-    public OffScreenImageSource(BufferedImage image) {
-        this(image, null);
-    }
-
-    // We can only have one consumer since we immediately return the data...
-    private ImageConsumer theConsumer;
-
-    public synchronized void addConsumer(ImageConsumer ic) {
-        theConsumer = ic;
-        produce();
-    }
-
-    public synchronized boolean isConsumer(ImageConsumer ic) {
-        return (ic == theConsumer);
-    }
-
-    public synchronized void removeConsumer(ImageConsumer ic) {
-        if (theConsumer == ic) {
-            theConsumer = null;
-        }
-    }
-
-    public void startProduction(ImageConsumer ic) {
-        addConsumer(ic);
-    }
-
-    public void requestTopDownLeftRightResend(ImageConsumer ic) {
-    }
-
-    private void sendPixels() {
-        ColorModel cm = image.getColorModel();
-        WritableRaster raster = image.getRaster();
-        int numDataElements = raster.getNumDataElements();
-        int dataType = raster.getDataBuffer().getDataType();
-        int[] scanline = new int[width*numDataElements];
-        boolean needToCvt = true;
-
-        if (cm instanceof IndexColorModel) {
-            byte[] pixels = new byte[width];
-            theConsumer.setColorModel(cm);
-
-            if (raster instanceof ByteComponentRaster) {
-                needToCvt = false;
-                for (int y=0; y < height; y++) {
-                    raster.getDataElements(0, y, width, 1, pixels);
-                    theConsumer.setPixels(0, y, width, 1, cm, pixels, 0,
-                                          width);
-                }
-            }
-            else if (raster instanceof BytePackedRaster) {
-                needToCvt = false;
-                // Binary image.  Need to unpack it
-                for (int y=0; y < height; y++) {
-                    raster.getPixels(0, y, width, 1, scanline);
-                    for (int x=0; x < width; x++) {
-                        pixels[x] = (byte) scanline[x];
-                    }
-                    theConsumer.setPixels(0, y, width, 1, cm, pixels, 0,
-                                          width);
-                }
-            }
-            else if (dataType == DataBuffer.TYPE_SHORT ||
-                     dataType == DataBuffer.TYPE_INT)
-            {
-                // Probably a short or int "GRAY" image
-                needToCvt = false;
-                for (int y=0; y < height; y++) {
-                    raster.getPixels(0, y, width, 1, scanline);
-                    theConsumer.setPixels(0, y, width, 1, cm, scanline, 0,
-                                          width);
-                }
-            }
-        }
-        else if (cm instanceof DirectColorModel) {
-            theConsumer.setColorModel(cm);
-            needToCvt = false;
-            switch (dataType) {
-            case DataBuffer.TYPE_INT:
-                for (int y=0; y < height; y++) {
-                    raster.getDataElements(0, y, width, 1, scanline);
-                    theConsumer.setPixels(0, y, width, 1, cm, scanline, 0,
-                                          width);
-                }
-                break;
-            case DataBuffer.TYPE_BYTE:
-                byte[] bscanline = new byte[width];
-                for (int y=0; y < height; y++) {
-                    raster.getDataElements(0, y, width, 1, bscanline);
-                    for (int x=0; x < width; x++) {
-                        scanline[x] = bscanline[x]&0xff;
-                    }
-                    theConsumer.setPixels(0, y, width, 1, cm, scanline, 0,
-                                          width);
-                }
-                break;
-            case DataBuffer.TYPE_USHORT:
-                short[] sscanline = new short[width];
-                for (int y=0; y < height; y++) {
-                    raster.getDataElements(0, y, width, 1, sscanline);
-                    for (int x=0; x < width; x++) {
-                        scanline[x] = sscanline[x]&0xffff;
-                    }
-                    theConsumer.setPixels(0, y, width, 1, cm, scanline, 0,
-                                          width);
-                }
-                break;
-            default:
-                needToCvt = true;
-            }
-        }
-
-        if (needToCvt) {
-            // REMIND: Need to add other types of CMs here
-            ColorModel newcm = ColorModel.getRGBdefault();
-            theConsumer.setColorModel(newcm);
-
-            for (int y=0; y < height; y++) {
-                for (int x=0; x < width; x++) {
-                    scanline[x] = image.getRGB(x, y);
-                }
-                theConsumer.setPixels(0, y, width, 1, newcm, scanline, 0,
-                                      width);
-            }
-        }
-    }
-
-    private void produce() {
-        try {
-            theConsumer.setDimensions(image.getWidth(), image.getHeight());
-            theConsumer.setProperties(properties);
-            sendPixels();
-            theConsumer.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
-        } catch (NullPointerException e) {
-            if (theConsumer != null) {
-                theConsumer.imageComplete(ImageConsumer.IMAGEERROR);
-            }
-        }
-    }
-}
diff --git a/openjdk/sun/awt/image/ShortComponentRaster.java b/openjdk/sun/awt/image/ShortComponentRaster.java
deleted file mode 100644
index 8ec545c5..00000000
--- a/openjdk/sun/awt/image/ShortComponentRaster.java
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.RasterFormatException;
-import java.awt.image.SampleModel;
-import java.awt.image.ComponentSampleModel;
-import java.awt.image.SinglePixelPackedSampleModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferUShort;
-import java.awt.Rectangle;
-import java.awt.Point;
-
-/**
- * This class defines a Raster with pixels consisting of one or more 16-bit
- * data elements stored in close proximity to each other in a short integer
- * array.  The bit precision per data element is that
- * of the data type (that is, the bit precision for this Raster is 16).
- * There is only one pixel stride and one scanline stride for all
- * bands.  This type of Raster can be used with a
- * ComponentColorModel if there are multiple bands, or a
- * IndexColorModel if there is only one band.
- * <p>
- * For example, 5-6-5 RGB image data can be represented by a
- * ShortComponentRaster using a SinglePixelPackedSampleModel and
- * a ComponentColorModel.
- *
- *
- */
-public class ShortComponentRaster extends SunWritableRaster {
-
-    /** private band offset for use by native code */
-    protected int bandOffset;
-
-    /** Data offsets for each band of image data. */
-    protected int[]         dataOffsets;
-
-    /** Scanline stride of the image data contained in this Raster. */
-    protected int           scanlineStride;
-
-    /** Pixel stride of the image data contained in this Raster. */
-    protected int           pixelStride;
-
-    /** The image data array. */
-    protected short[]       data;
-
-    int type;
-
-    /** A cached copy of minX + width for use in bounds checks. */
-    private int maxX;
-
-    /** A cached copy of minY + height for use in bounds checks. */
-    private int maxY;
-
-    /**
-     *  Constructs a ShortComponentRaster with the given SampleModel.
-     *  The Raster's upper left corner is origin and it is the same
-     *  size as the SampleModel.  A DataBuffer large enough to describe the
-     *  Raster is automatically created.  SampleModel must be of type
-     *  ComponentSampleModel or SinglePixelPackedSampleModel.
-     *  @param sampleModel     The SampleModel that specifies the layout.
-     *  @param origin          The Point that specified the origin.
-     */
-    public ShortComponentRaster(SampleModel sampleModel, Point origin) {
-        this(sampleModel,
-             sampleModel.createDataBuffer(),
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a ShortComponentRaster with the given SampleModel
-     * and DataBuffer.  The Raster's upper left corner is origin and
-     * it is the same sizes the SampleModel.  The DataBuffer is not
-     * initialized and must be a DataBufferUShort compatible with SampleModel.
-     * SampleModel must be of type ComponentSampleModel or
-     * SinglePixelPackedSampleModel.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferUShort that contains the image data.
-     * @param origin          The Point that specifies the origin.
-     */
-    public ShortComponentRaster(SampleModel sampleModel,
-                                   DataBuffer dataBuffer,
-                                   Point origin) {
-        this(sampleModel,
-             dataBuffer,
-             new Rectangle(origin.x,
-                           origin.y,
-                           sampleModel.getWidth(),
-                           sampleModel.getHeight()),
-             origin,
-             null);
-    }
-
-    /**
-     * Constructs a ShortComponentRaster with the given SampleModel,
-     * DataBuffer, and parent.  DataBuffer must be a DataBufferUShort and
-     * SampleModel must be of type ComponentSampleModel or
-     * SinglePixelPackedSampleModel.  When translated into the base Raster's
-     * coordinate system, aRegion must be contained by the base Raster.
-     * Origin is the coodinate in the new Raster's coordinate system of
-     * the origin of the base Raster.  (The base Raster is the Raster's
-     * ancestor which has no parent.)
-     *
-     * Note that this constructor should generally be called by other
-     * constructors or create methods, it should not be used directly.
-     * @param sampleModel     The SampleModel that specifies the layout.
-     * @param dataBuffer      The DataBufferUShort that contains the image data.
-     * @param aRegion         The Rectangle that specifies the image area.
-     * @param origin          The Point that specifies the origin.
-     * @param parent          The parent (if any) of this raster.
-     */
-    public ShortComponentRaster(SampleModel sampleModel,
-                                   DataBuffer dataBuffer,
-                                   Rectangle aRegion,
-                                   Point origin,
-                                   ShortComponentRaster parent) {
-
-        super(sampleModel, dataBuffer, aRegion, origin, parent);
-        this.maxX = minX + width;
-        this.maxY = minY + height;
-
-        if(!(dataBuffer instanceof DataBufferUShort)) {
-            throw new RasterFormatException("ShortComponentRasters must have "+
-                                            "short DataBuffers");
-        }
-
-        DataBufferUShort dbus = (DataBufferUShort)dataBuffer;
-        this.data = stealData(dbus, 0);
-        if (dbus.getNumBanks() != 1) {
-            throw new
-                RasterFormatException("DataBuffer for ShortComponentRasters"+
-                                      " must only have 1 bank.");
-        }
-        int dbOffset = dbus.getOffset();
-
-        if (sampleModel instanceof ComponentSampleModel) {
-            ComponentSampleModel csm = (ComponentSampleModel)sampleModel;
-            this.type = IntegerComponentRaster.TYPE_USHORT_SAMPLES;
-            this.scanlineStride = csm.getScanlineStride();
-            this.pixelStride = csm.getPixelStride();
-            this.dataOffsets = csm.getBandOffsets();
-            int xOffset = aRegion.x - origin.x;
-            int yOffset = aRegion.y - origin.y;
-            for (int i = 0; i < getNumDataElements(); i++) {
-                dataOffsets[i] += dbOffset +
-                    xOffset*pixelStride+yOffset*scanlineStride;
-            }
-        } else if (sampleModel instanceof SinglePixelPackedSampleModel) {
-            SinglePixelPackedSampleModel sppsm =
-                    (SinglePixelPackedSampleModel)sampleModel;
-            this.type = IntegerComponentRaster.TYPE_USHORT_PACKED_SAMPLES;
-            this.scanlineStride = sppsm.getScanlineStride();
-            this.pixelStride    = 1;
-            this.dataOffsets = new int[1];
-            this.dataOffsets[0] = dbOffset;
-            int xOffset = aRegion.x - origin.x;
-            int yOffset = aRegion.y - origin.y;
-            dataOffsets[0] += xOffset+yOffset*scanlineStride;
-        } else {
-            throw new RasterFormatException("ShortComponentRasters must have"+
-                "ComponentSampleModel or SinglePixelPackedSampleModel");
-        }
-        this.bandOffset = this.dataOffsets[0];
-
-        verify();
-    }
-
-    /**
-     * Returns a copy of the data offsets array. For each band the data offset
-     * is the index into the band's data array, of the first sample of the
-     * band.
-     */
-    public int[] getDataOffsets() {
-        return (int[]) dataOffsets.clone();
-    }
-
-    /**
-     * Returns the data offset for the specified band.  The data offset
-     * is the index into the data array in which the first sample
-     * of the first scanline is stored.
-     * @param band  The band whose offset is returned.
-     */
-    public int getDataOffset(int band) {
-        return dataOffsets[band];
-    }
-
-    /**
-     * Returns the scanline stride -- the number of data array elements between
-     * a given sample and the same sample in the same column of the next row.
-     */
-    public int getScanlineStride() {
-        return scanlineStride;
-    }
-
-    /**
-     * Returns pixel stride -- the number of data array elements  between two
-     * samples for the same band on the same scanline.
-     */
-    public int getPixelStride() {
-        return pixelStride;
-    }
-
-    /**
-     * Returns a reference to the data array.
-     */
-    public short[] getDataStorage() {
-        return data;
-    }
-
-    /**
-     * Returns the data elements for all bands at the specified
-     * location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        short outData[];
-        if (obj == null) {
-            outData = new short[numDataElements];
-        } else {
-            outData = (short[])obj;
-        }
-        int off = (y-minY)*scanlineStride +
-                  (x-minX)*pixelStride;
-
-        for (int band = 0; band < numDataElements; band++) {
-            outData[band] = data[dataOffsets[band] + off];
-        }
-
-        return outData;
-    }
-
-    /**
-     * Returns an array  of data elements from the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * <pre>
-     *       short[] bandData = (short[])Raster.getDataElements(x, y, w, h, null);
-     *       int numDataElements = Raster.getBands();
-     *       short[] pixel = new short[numDataElements];
-     *       // To find the data element at location (x2, y2)
-     *       System.arraycopy(bandData, ((y2-y)*w + (x2-x))*numDataElements,
-     *                        pixel, 0, numDataElements);
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements().
-     *                 If null an array of appropriate type and size will be
-     *                 allocated.
-     * @return         An object reference to an array of type defined by
-     *                 getTransferType() with the request pixel data.
-     */
-    public Object getDataElements(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        short outData[];
-        if (obj == null) {
-            outData = new short[w*h*numDataElements];
-        } else {
-            outData = (short[])obj;
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    outData[off++] = data[dataOffsets[c] + xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-    /**
-     * Returns a short integer array of data elements from the
-     * specified rectangular region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * <pre>
-     *       short[] bandData = Raster.getShortData(x, y, w, h, null);
-     *       // To find the data element at location (x2, y2)
-     *       short dataElenent = bandData[((y2-y)*w + (x2-x))];
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the sample rectangle.
-     * @param height   Height of the sample rectangle.
-     * @param band     The band to return.
-     * @param outData  If non-null, data elements for all bands
-     *                 at the specified location are returned in this array.
-     * @return         Data array with data elements for all bands.
-     */
-    public short[] getShortData(int x, int y, int w, int h,
-                               int band, short[] outData) {
-        // Bounds check for 'band' will be performed automatically
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (outData == null) {
-            outData = new short[numDataElements*w*h];
-        }
-        int yoff =  (y-minY)*scanlineStride +
-                    (x-minX)*pixelStride+ dataOffsets[band];
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        if (pixelStride == 1) {
-            if (scanlineStride == w) {
-                System.arraycopy(data, yoff, outData, 0, w*h);
-            }
-            else {
-                for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                    System.arraycopy(data, yoff, outData, off, w);
-                    off += w;
-                }
-            }
-        }
-        else {
-            for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                xoff = yoff;
-                for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                    outData[off++] = data[xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-    /**
-     * Returns a short integer array  of data elements from the
-     * specified rectangular region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * <pre>
-     *       short[] bandData = Raster.getShortData(x, y, w, h, null);
-     *       int numDataElements = Raster.getNumBands();
-     *       short[] pixel = new short[numDataElements];
-     *       // To find the data element at location (x2, y2)
-     *       System.arraycopy(bandData, ((y2-y)*w + (x2-x))*numDataElements,
-     *                        pixel, 0, numDataElements);
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param width    Width of the pixel rectangle.
-     * @param height   Height of the pixel rectangle.
-     * @param outData  If non-null, data elements for all bands
-     *                 at the specified location are returned in this array.
-     * @return         Data array with data elements for all bands.
-     */
-    public short[] getShortData(int x, int y, int w, int h, short[] outData) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        if (outData == null) {
-            outData = new short[numDataElements*w*h];
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    outData[off++] = data[dataOffsets[c] + xoff];
-                }
-            }
-        }
-
-        return outData;
-    }
-
-    /**
-     * Stores the data elements for all bands at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinate is out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * @param x        The X coordinate of the pixel location.
-     * @param y        The Y coordinate of the pixel location.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length getNumDataElements()
-     *                 containing the pixel data to place at x,y.
-     */
-    public void setDataElements(int x, int y, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x >= this.maxX) || (y >= this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        short inData[] = (short[])obj;
-        int off = (y-minY)*scanlineStride +
-                  (x-minX)*pixelStride;
-        for (int i = 0; i < numDataElements; i++) {
-            data[dataOffsets[i] + off] = (short) inData[i];
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * @param x          The X coordinate of the pixel location.
-     * @param y          The Y coordinate of the pixel location.
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    public void setDataElements(int x, int y, Raster inRaster) {
-        int dstOffX = x + inRaster.getMinX();
-        int dstOffY = y + inRaster.getMinY();
-        int width  = inRaster.getWidth();
-        int height = inRaster.getHeight();
-        if ((dstOffX < this.minX) || (dstOffY < this.minY) ||
-            (dstOffX + width > this.maxX) || (dstOffY + height > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-
-        setDataElements(dstOffX, dstOffY, width, height, inRaster);
-    }
-
-    /**
-     * Stores the Raster data at the specified location.
-     * @param dstX The absolute X coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param dstY The absolute Y coordinate of the destination pixel
-     * that will receive a copy of the upper-left pixel of the
-     * inRaster
-     * @param width      The number of pixels to store horizontally
-     * @param height     The number of pixels to store vertically
-     * @param inRaster   Raster of data to place at x,y location.
-     */
-    private void setDataElements(int dstX, int dstY,
-                                 int width, int height,
-                                 Raster inRaster) {
-        // Assume bounds checking has been performed previously
-        if (width <= 0 || height <= 0) {
-            return;
-        }
-
-        // Write inRaster (minX, minY) to (dstX, dstY)
-
-        int srcOffX = inRaster.getMinX();
-        int srcOffY = inRaster.getMinY();
-        Object tdata = null;
-
-//      // REMIND: Do something faster!
-//      if (inRaster instanceof ShortComponentRaster) {
-//      }
-
-        for (int startY=0; startY < height; startY++) {
-            // Grab one scanline at a time
-            tdata = inRaster.getDataElements(srcOffX, srcOffY+startY,
-                                             width, 1, tdata);
-            setDataElements(dstX, dstY + startY, width, 1, tdata);
-        }
-    }
-
-    /**
-     * Stores an array of data elements into the specified rectangular
-     * region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * A ClassCastException will be thrown if the input object is non null
-     * and references anything other than an array of transferType.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * for the nth band at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))*numDataElements + n]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   An object reference to an array of type defined by
-     *                 getTransferType() and length w*h*getNumDataElements()
-     *                 containing the pixel data to place between x,y and
-     *                 x+h, y+h.
-     */
-    public void setDataElements(int x, int y, int w, int h, Object obj) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        short inData[] = (short[])obj;
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    data[dataOffsets[c] + xoff] = (short) inData[off++];
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Stores a short integer array of data elements into the
-     * specified rectangular region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param band     The band to set.
-     * @param inData   The data elements to be stored.
-     */
-    public void putShortData(int x, int y, int w, int h,
-                             int band, short[] inData) {
-        // Bounds check for 'band' will be performed automatically
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int yoff =  (y-minY)*scanlineStride +
-                    (x-minX)*pixelStride + dataOffsets[band];
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        if (pixelStride == 1) {
-            if (scanlineStride == w) {
-                System.arraycopy(inData, 0, data, yoff, w*h);
-            }
-            else {
-                for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                    System.arraycopy(inData, off, data, yoff, w);
-                    off += w;
-                }
-            }
-        }
-        else {
-            for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-                xoff = yoff;
-                for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                    data[xoff] = inData[off++];
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Stores a short integer array of data elements into the
-     * specified rectangular region.
-     * An ArrayIndexOutOfBounds exception will be thrown at runtime
-     * if the pixel coordinates are out of bounds.
-     * The data elements in the
-     * data array are assumed to be packed.  That is, a data element
-     * for the nth band at location (x2, y2) would be found at:
-     * <pre>
-     *      inData[((y2-y)*w + (x2-x))*numDataElements + n]
-     * </pre>
-     * @param x        The X coordinate of the upper left pixel location.
-     * @param y        The Y coordinate of the upper left pixel location.
-     * @param w        Width of the pixel rectangle.
-     * @param h        Height of the pixel rectangle.
-     * @param inData   The data elements to be stored.
-     */
-    public void putShortData(int x, int y, int w, int h, short[] inData) {
-        if ((x < this.minX) || (y < this.minY) ||
-            (x + w > this.maxX) || (y + h > this.maxY)) {
-            throw new ArrayIndexOutOfBoundsException
-                ("Coordinate out of bounds!");
-        }
-        int yoff = (y-minY)*scanlineStride +
-                   (x-minX)*pixelStride;
-        int xoff;
-        int off = 0;
-        int xstart;
-        int ystart;
-
-        for (ystart=0; ystart < h; ystart++, yoff += scanlineStride) {
-            xoff = yoff;
-            for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
-                for (int c = 0; c < numDataElements; c++) {
-                    data[dataOffsets[c] + xoff] = inData[off++];
-                }
-            }
-        }
-
-        markDirty();
-    }
-
-    /**
-     * Creates a subraster given a region of the raster.  The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this raster to the upper-left corner
-     * of the subraster.  A subset of the bands of the parent Raster may
-     * be specified.  If this is null, then all the bands are present in the
-     * subRaster. A translation to the subRaster may also be specified.
-     * Note that the subraster will reference the same
-     * band objects as the parent raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent raster.
-     */
-    public Raster createChild (int x, int y,
-                               int width, int height,
-                               int x0, int y0, int[] bandList) {
-        WritableRaster newRaster = createWritableChild(x, y,
-                                                       width, height,
-                                                       x0, y0,
-                                                       bandList);
-        return (Raster) newRaster;
-    }
-
-    /**
-     * Creates a Writable subRaster given a region of the Raster. The x and y
-     * coordinates specify the horizontal and vertical offsets
-     * from the upper-left corner of this Raster to the upper-left corner
-     * of the subRaster.  A subset of the bands of the parent Raster may
-     * be specified.  If this is null, then all the bands are present in the
-     * subRaster. A translation to the subRaster may also be specified.
-     * Note that the subRaster will reference the same
-     * DataBuffers as the parent Raster, but using different offsets.
-     * @param x               X offset.
-     * @param y               Y offset.
-     * @param width           Width (in pixels) of the subraster.
-     * @param height          Height (in pixels) of the subraster.
-     * @param x0              Translated X origin of the subraster.
-     * @param y0              Translated Y origin of the subraster.
-     * @param bandList        Array of band indices.
-     * @exception RasterFormatException
-     *            if the specified bounding box is outside of the parent Raster.
-     */
-    public WritableRaster createWritableChild(int x, int y,
-                                              int width, int height,
-                                              int x0, int y0,
-                                              int[] bandList) {
-        if (x < this.minX) {
-            throw new RasterFormatException("x lies outside the raster");
-        }
-        if (y < this.minY) {
-            throw new RasterFormatException("y lies outside the raster");
-        }
-        if ((x+width < x) || (x+width > this.minX + this.width)) {
-            throw new RasterFormatException("(x + width) is outside of Raster");
-        }
-        if ((y+height < y) || (y+height > this.minY + this.height)) {
-            throw new RasterFormatException("(y + height) is outside of Raster");
-        }
-
-        SampleModel sm;
-
-        if (bandList != null)
-            sm = sampleModel.createSubsetSampleModel(bandList);
-        else
-            sm = sampleModel;
-
-        int deltaX = x0 - x;
-        int deltaY = y0 - y;
-
-        return new ShortComponentRaster(sm,
-                                       dataBuffer,
-                                       new Rectangle(x0, y0, width, height),
-                                       new Point(sampleModelTranslateX+deltaX,
-                                                 sampleModelTranslateY+deltaY),
-                                       this);
-    }
-
-    /**
-     * Creates a Raster with the same layout but using a different
-     * width and height, and with new zeroed data arrays.
-     */
-    public WritableRaster createCompatibleWritableRaster(int w, int h) {
-        if (w <= 0 || h <=0) {
-            throw new RasterFormatException("negative "+
-                                          ((w <= 0) ? "width" : "height"));
-        }
-
-        SampleModel sm = sampleModel.createCompatibleSampleModel(w, h);
-
-        return new ShortComponentRaster(sm, new Point(0, 0));
-    }
-
-    /**
-     * Creates a Raster with the same layout and the same
-     * width and height, and with new zeroed data arrays.  If
-     * the Raster is a subRaster, this will call
-     * createCompatibleRaster(width, height).
-     */
-    public WritableRaster createCompatibleWritableRaster() {
-        return createCompatibleWritableRaster(width,height);
-    }
-
-    /**
-     * Verify that the layout parameters are consistent with the data.
-     *
-     * The method verifies whether scanline stride and pixel stride do not
-     * cause an integer overflow during calculation of a position of the pixel
-     * in data buffer. It also verifies whether the data buffer has enough data
-     *  to correspond the raster layout attributes.
-     *
-     * @throws RasterFormatException if an integer overflow is detected,
-     * or if data buffer has not enough capacity.
-     */
-    protected final void verify() {
-        /* Need to re-verify the dimensions since a sample model may be
-         * specified to the constructor
-         */
-        if (width <= 0 || height <= 0 ||
-            height > (Integer.MAX_VALUE / width))
-        {
-            throw new RasterFormatException("Invalid raster dimension");
-        }
-
-        for (int i = 0; i < dataOffsets.length; i++) {
-            if (dataOffsets[i] < 0) {
-                throw new RasterFormatException("Data offsets for band " + i
-                            + "(" + dataOffsets[i]
-                            + ") must be >= 0");
-            }
-        }
-
-        // we can be sure that width and height are greater than 0
-        if (scanlineStride < 0 ||
-            scanlineStride > (Integer.MAX_VALUE / height) ||
-            scanlineStride > data.length)
-        {
-            // integer overflow
-            throw new RasterFormatException("Incorrect scanline stride: "
-                    + scanlineStride);
-        }
-        int lastScanOffset = (height - 1) * scanlineStride;
-
-        if (pixelStride < 0 ||
-            pixelStride > (Integer.MAX_VALUE / width) ||
-            pixelStride > data.length)
-        {
-            // integer overflow
-            throw new RasterFormatException("Incorrect pixel stride: "
-                    + pixelStride);
-        }
-        int lastPixelOffset = (width - 1) * pixelStride;
-
-        if (lastPixelOffset > (Integer.MAX_VALUE - lastScanOffset)) {
-            // integer overflow
-            throw new RasterFormatException("Incorrect raster attributes");
-        }
-        lastPixelOffset += lastScanOffset;
-
-        int index;
-        int maxIndex = 0;
-        for (int i = 0; i < numDataElements; i++) {
-            if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
-                throw new RasterFormatException("Incorrect band offset: "
-                            + dataOffsets[i]);
-            }
-
-            index = lastPixelOffset + dataOffsets[i];
-
-            if (index > maxIndex) {
-                maxIndex = index;
-            }
-        }
-        if (data.length <= maxIndex) {
-            throw new RasterFormatException("Data array too small (should be > "
-                    + maxIndex + " )");
-        }
-    }
-
-    public String toString() {
-        return new String ("ShortComponentRaster: width = "+width
-                           +" height = " + height
-                           +" #numDataElements "+numDataElements);
-                           // +" xOff = "+xOffset+" yOff = "+yOffset);
-    }
-
-}
diff --git a/runtime/openjdk/misc.cs b/runtime/openjdk/misc.cs
new file mode 100644
index 00000000..85529d95
--- /dev/null
+++ b/runtime/openjdk/misc.cs
@@ -0,0 +1,585 @@
+/*
+  Copyright (C) 2007-2013 Jeroen Frijters
+  Copyright (C) 2009 Volker Berlin (i-net software)
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jeroen Frijters
+  jeroen@frijters.net
+  
+*/
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Security;
+using System.Security.Cryptography;
+using System.Security.Principal;
+using IKVM.Internal;
+
+static class Java_ikvm_runtime_Startup
+{
+	// this method is called from ikvm.runtime.Startup.exitMainThread() and from JNI's DetachCurrentThread
+	public static void jniDetach()
+	{
+#if !FIRST_PASS
+		java.lang.Thread.currentThread().die();
+#endif
+	}
+
+	public static void addBootClassPathAssembly(Assembly asm)
+	{
+		ClassLoaderWrapper.GetBootstrapClassLoader().AddDelegate(AssemblyClassLoader.FromAssembly(asm));
+	}
+}
+
+static class Java_java_lang_ref_Reference
+{
+	public static bool noclassgc()
+	{
+#if CLASSGC
+		return !JVM.classUnloading;
+#else
+		return true;
+#endif
+	}
+}
+
+static class Java_java_util_logging_FileHandler
+{
+	public static bool isSetUID()
+	{
+		// TODO
+		return false;
+	}
+}
+
+static class Java_java_util_jar_JarFile
+{
+	public static string[] getMetaInfEntryNames(object thisJarFile)
+	{
+#if FIRST_PASS
+		return null;
+#else
+		java.util.zip.ZipFile zf = (java.util.zip.ZipFile)thisJarFile;
+		java.util.Enumeration entries = zf.entries();
+		List<string> list = null;
+		while (entries.hasMoreElements())
+		{
+			java.util.zip.ZipEntry entry = (java.util.zip.ZipEntry)entries.nextElement();
+			if (entry.getName().StartsWith("META-INF/", StringComparison.OrdinalIgnoreCase))
+			{
+				if (list == null)
+				{
+					list = new List<string>();
+				}
+				list.Add(entry.getName());
+			}
+		}
+		return list == null ? null : list.ToArray();
+#endif
+	}
+}
+
+static class Java_java_util_zip_ClassStubZipEntry
+{
+	public static void expandIkvmClasses(object _zipFile, object _entries)
+	{
+#if !FIRST_PASS
+		java.util.zip.ZipFile zipFile = (java.util.zip.ZipFile)_zipFile;
+		java.util.LinkedHashMap entries = (java.util.LinkedHashMap)_entries;
+
+		try
+		{
+			string path = zipFile.getName();
+			java.util.zip.ZipEntry entry = (java.util.zip.ZipEntry)entries.get(JVM.JarClassList);
+			if (entry != null && VirtualFileSystem.IsVirtualFS(path))
+			{
+				using (VirtualFileSystem.ZipEntryStream stream = new VirtualFileSystem.ZipEntryStream(zipFile, entry))
+				{
+					entries.remove(entry.name);
+					BinaryReader br = new BinaryReader(stream);
+					int count = br.ReadInt32();
+					for (int i = 0; i < count; i++)
+					{
+						java.util.zip.ClassStubZipEntry classEntry = new java.util.zip.ClassStubZipEntry(path, br.ReadString());
+						classEntry.setMethod(java.util.zip.ClassStubZipEntry.STORED);
+						classEntry.setTime(entry.getTime());
+						entries.put(classEntry.name, classEntry);
+					}
+				}
+			}
+		}
+		catch (java.io.IOException)
+		{
+		}
+		catch (IOException)
+		{
+		}
+#endif
+	}
+}
+
+static class Java_sun_awt_image_ByteComponentRaster
+{
+	public static void initIDs()
+	{
+	}
+}
+
+static class Java_sun_awt_image_BytePackedRaster
+{
+	public static void initIDs()
+	{
+	}
+}
+
+static class Java_sun_awt_image_IntegerComponentRaster
+{
+	public static void initIDs()
+	{
+	}
+}
+
+static class Java_sun_awt_image_ShortComponentRaster
+{
+	public static void initIDs()
+	{
+	}
+}
+
+static class Java_sun_awt_FontDescriptor
+{
+	public static void initIDs()
+	{
+	}
+}
+
+static class Java_sun_invoke_anon_AnonymousClassLoader
+{
+	public static java.lang.Class loadClassInternal(java.lang.Class hostClass, byte[] classFile, object[] patchArray)
+	{
+		throw new NotImplementedException();
+	}
+}
+
+static class Java_sun_net_spi_DefaultProxySelector
+{
+	public static bool init()
+	{
+		return true;
+	}
+
+	public static object getSystemProxy(object thisDefaultProxySelector, string protocol, string host)
+	{
+		// TODO on Whidbey we might be able to use System.Net.Configuration.DefaultProxySection.Proxy
+		return null;
+	}
+}
+
+static class Java_sun_nio_fs_NetPath
+{
+	public static string toRealPathImpl(string path)
+	{
+#if FIRST_PASS
+		return null;
+#else
+		path = java.io.FileSystem.getFileSystem().canonicalize(path);
+		if (VirtualFileSystem.IsVirtualFS(path))
+		{
+			if (VirtualFileSystem.CheckAccess(path, Java_java_io_Win32FileSystem.ACCESS_READ))
+			{
+				return path;
+			}
+			throw new java.nio.file.NoSuchFileException(path);
+		}
+		try
+		{
+			File.GetAttributes(path);
+			return path;
+		}
+		catch (FileNotFoundException)
+		{
+			throw new java.nio.file.NoSuchFileException(path);
+		}
+		catch (DirectoryNotFoundException)
+		{
+			throw new java.nio.file.NoSuchFileException(path);
+		}
+		catch (UnauthorizedAccessException)
+		{
+			throw new java.nio.file.AccessDeniedException(path);
+		}
+		catch (SecurityException)
+		{
+			throw new java.nio.file.AccessDeniedException(path);
+		}
+		catch (ArgumentException x)
+		{
+			throw new java.nio.file.FileSystemException(path, null, x.Message);
+		}
+		catch (NotSupportedException x)
+		{
+			throw new java.nio.file.FileSystemException(path, null, x.Message);
+		}
+		catch (IOException x)
+		{
+			throw new java.nio.file.FileSystemException(path, null, x.Message);
+		}
+#endif
+	}
+}
+
+static class Java_sun_rmi_server_MarshalInputStream
+{
+	public static object latestUserDefinedLoader()
+	{
+		return Java_java_io_ObjectInputStream.latestUserDefinedLoader();
+	}
+}
+
+static class Java_sun_security_provider_NativeSeedGenerator
+{
+	public static bool nativeGenerateSeed(byte[] result)
+	{
+		try
+		{
+			RNGCryptoServiceProvider csp = new RNGCryptoServiceProvider();
+			csp.GetBytes(result);
+			return true;
+		}
+		catch (CryptographicException)
+		{
+			return false;
+		}
+	}
+}
+
+static class Java_com_sun_java_util_jar_pack_NativeUnpack
+{
+	public static void initIDs()
+	{
+	}
+
+	public static long start(object thisNativeUnpack, object buf, long offset)
+	{
+		throw new NotImplementedException();
+	}
+
+	public static bool getNextFile(object thisNativeUnpack, object[] parts)
+	{
+		throw new NotImplementedException();
+	}
+
+	public static object getUnusedInput(object thisNativeUnpack)
+	{
+		throw new NotImplementedException();
+	}
+
+	public static long finish(object thisNativeUnpack)
+	{
+		throw new NotImplementedException();
+	}
+
+	public static bool setOption(object thisNativeUnpack, string opt, string value)
+	{
+		throw new NotImplementedException();
+	}
+
+	public static string getOption(object thisNativeUnpack, string opt)
+	{
+		throw new NotImplementedException();
+	}
+}
+
+static class Java_com_sun_security_auth_module_NTSystem
+{
+	public static void getCurrent(object thisObj, bool debug)
+	{
+		WindowsIdentity id = WindowsIdentity.GetCurrent();
+		string[] name = id.Name.Split('\\');
+		SetField(thisObj, "userName", name[1]);
+		SetField(thisObj, "domain", name[0]);
+		SetField(thisObj, "domainSID", id.User.AccountDomainSid.Value);
+		SetField(thisObj, "userSID", id.User.Value);
+		string[] groups = new string[id.Groups.Count];
+		for (int i = 0; i < groups.Length; i++)
+		{
+			groups[i] = id.Groups[i].Value;
+		}
+		SetField(thisObj, "groupIDs", groups);
+		// HACK it turns out that Groups[0] is the primary group, but AFAIK this is not documented anywhere
+		SetField(thisObj, "primaryGroupID", groups[0]);
+	}
+
+	private static void SetField(object thisObj, string field, object value)
+	{
+		thisObj.GetType().GetField(field, BindingFlags.NonPublic | BindingFlags.Instance).SetValue(thisObj, value);
+	}
+
+	public static long getImpersonationToken0(object thisObj)
+	{
+		return WindowsIdentity.GetCurrent().Token.ToInt64();
+	}
+}
+
+static class Java_com_sun_security_auth_module_SolarisSystem
+{
+	public static void getSolarisInfo(object thisObj)
+	{
+		throw new NotImplementedException();
+	}
+}
+
+static class Java_com_sun_security_auth_module_UnixSystem
+{
+	public static void getUnixInfo(object thisObj)
+	{
+		throw new NotImplementedException();
+	}
+}
+
+static class Java_com_sun_media_sound_JDK13Services
+{
+	public static string getDefaultProviderClassName(object deviceClass)
+	{
+		return null;
+	}
+
+	public static string getDefaultInstanceName(object deviceClass)
+	{
+		return null;
+	}
+
+	public static object getProviders(object providerClass)
+	{
+#if FIRST_PASS
+		return null;
+#else
+		return new java.util.ArrayList();
+#endif
+	}
+}
+
+static class Java_java_awt_AWTEvent
+{
+	public static void initIDs() { }
+	public static void nativeSetSource(object thisObj, object peer) { }
+}
+
+static class Java_java_awt_Button
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Checkbox
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_CheckboxMenuItem
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Color
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Component
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Container
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Cursor
+{
+	public static void initIDs() { }
+	public static void finalizeImpl(Int64 pData) { }
+}
+
+static class Java_java_awt_Dialog
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Dimension
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Event
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_FileDialog
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Frame
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_FontMetrics
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Insets
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_KeyboardFocusManager
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Label
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Menu
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_MenuBar
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_MenuComponent
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_MenuItem
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Rectangle
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Scrollbar
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_ScrollPane
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_ScrollPaneAdjustable
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_SplashScreen
+{
+	public static void _update(long splashPtr, int[] data, int x, int y, int width, int height, int scanlineStride) { }
+	public static bool _isVisible(long splashPtr) { return false; }
+	public static object _getBounds(long splashPtr) { return null; }
+	public static long _getInstance() { return 0; }
+	public static void _close(long splashPtr) { }
+	public static String _getImageFileName(long splashPtr) { return null; }
+	public static String _getImageJarName(long splashPtr) { return null; }
+	public static bool _setImageData(long splashPtr, byte[] data) { return false; }
+}
+
+static class Java_java_awt_TextArea
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_TextField
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Toolkit
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_TrayIcon
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_Window
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_event_InputEvent
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_event_MouseEvent
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_event_KeyEvent
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_image_ColorModel
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_image_ComponentSampleModel
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_image_Kernel
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_image_Raster
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_image_SinglePixelPackedSampleModel
+{
+	public static void initIDs() { }
+}
+
+static class Java_java_awt_image_SampleModel
+{
+	public static void initIDs() { }
+}