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

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

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

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

1 files changed, 142 insertions, 0 deletions

diff --git a/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java b/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
new file mode 100644
index 000000000..afc3da89e
--- /dev/null
+++ b/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
@@ -0,0 +1,142 @@
+/* DecodeRLE8.java --
+   Copyright (C)  2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.javax.imageio.bmp;
+
+import java.io.IOException;
+import javax.imageio.stream.ImageInputStream;
+import java.awt.image.BufferedImage;
+import java.awt.image.IndexColorModel;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.SinglePixelPackedSampleModel;
+import java.awt.image.SampleModel;
+import java.awt.Dimension;
+
+public class DecodeRLE8 extends BMPDecoder {
+
+    public DecodeRLE8(BMPFileHeader fh, BMPInfoHeader ih){
+        super(fh, ih);
+    }
+
+    /**
+     * RLE control codes
+     */
+    private static final byte ESCAPE = (byte)0;
+    private static final byte EOL = (byte)0; // end of line
+    private static final byte EOB = (byte)1; // end of bitmap
+    private static final byte DELTA = (byte)2; // delta
+
+    public BufferedImage decode(ImageInputStream in) throws IOException, BMPException {
+        IndexColorModel palette = readPalette(in);
+        skipToImage(in);
+
+        Dimension d = infoHeader.getSize();
+        int h = (int)d.getHeight();
+        int w = (int)d.getWidth();
+
+        byte[] data = uncompress(w, h, in);
+        SampleModel sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                                          w, h,
+                                                          new int[] {0xFF});
+        DataBuffer db = new DataBufferByte(data, w*h, 0);
+        WritableRaster raster = Raster.createWritableRaster(sm, db, null);
+
+        return new BufferedImage(palette, raster, false, null);
+    }
+
+    private byte[] uncompress(int w, int h, ImageInputStream in)
+        throws BMPException, IOException {
+        byte[] cmd = new byte[2];
+        byte[] data = new byte[w*h];
+        int offIn = 0;
+        int x=0,y=0;
+
+        try {
+            while((x + y*w) < w*h){
+                if(in.read(cmd) != 2)
+                    throw new IOException("Error reading compressed data.");
+
+                if(cmd[0] == ESCAPE){
+                    switch(cmd[1]){
+                    case EOB: // end of bitmap
+                        return data;
+                    case EOL: // end of line
+                        x = 0;
+                        y++;
+                        break;
+                    case DELTA: // delta
+                        if(in.read(cmd) != 2)
+                            throw new IOException("Error reading compressed data.");
+                        int dx = cmd[0] & (0xFF);
+                        int dy = cmd[1] & (0xFF);
+                        x += dx;
+                        y += dy;
+                        break;
+
+                    default:
+                        // decode a literal run
+                        int length = cmd[1] & (0xFF);
+                        int copylength = length;
+
+                        // absolute mode must be word-aligned
+                        length += (length & 1);
+
+                        byte[] run = new byte[length];
+                        if(in.read(run) != length)
+                            throw new IOException("Error reading compressed data.");
+
+                        System.arraycopy(run, 0, data, (x+w*(h-y-1)),
+                                         copylength);
+                        x += copylength;
+                        break;
+                    }
+                } else {
+                    // decode a byte run
+                    int length = cmd[0] & (0xFF);
+                    for(int i=0;i<length;i++)
+                        data[(h-y-1)*w + x++] = cmd[1];
+                }
+            }
+            return data;
+        } catch(ArrayIndexOutOfBoundsException e){
+            throw new BMPException("Invalid RLE data.");
+        }
+    }
+}