2005-04-19 Guilhem Lavaux <guilhem@kaffe.org>

	* java/awt/image/IndexColorModel.java
	(getRGB): Check if pixel is negative.

From-SVN: r98369

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 78f6bff6102e523229cfab813a021d64c1ac2b4a..39bc9b3766c4c78e20c08f77bd7ccbf65d3883c6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19  Guilhem Lavaux  <guilhem@kaffe.org>
+
+       * java/awt/image/IndexColorModel.java
+       (getRGB): Check if pixel is negative.
+
 2005-04-19  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/image/RasterOp.java:

diff --git a/libjava/java/awt/image/IndexColorModel.java b/libjava/java/awt/image/IndexColorModel.java
index e4ccc542903d99ae2901d8d31317fcad722b60b2..2a8a7887e2418682f1e275eab1b851f3ab56de76 100644 (file)
--- a/libjava/java/awt/image/IndexColorModel.java
+++ b/libjava/java/awt/image/IndexColorModel.java
@@ -432,7 +432,7 @@ public class IndexColorModel extends ColorModel
    */
   public final int getRGB (int pixel)
   {
-    if (pixel < map_size)
+    if (pixel >= 0 && pixel < map_size)
            return rgb[pixel];
     
     return 0;