Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1702
diff -u -b -B -r1.1702 ChangeLog
--- ChangeLog	26 Dec 2003 17:16:40 -0000	1.1702
+++ ChangeLog	26 Dec 2003 17:20:55 -0000
@@ -1,5 +1,9 @@
 2003-12-26  Thomas Fitzsimmons  <address@hidden>
 
+	* java/awt/image/PixelGrabber.java:
+	Fix implementation and update javadocs.
+2003-12-26  Thomas Fitzsimmons  <address@hidden>
+
 	* java/awt/FlowLayout.java (layoutContainer): Let components
 	assume their preferred height.  Centre components vertically.
 
Index: java/awt/image/PixelGrabber.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/PixelGrabber.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 PixelGrabber.java
--- java/awt/image/PixelGrabber.java	1 Dec 2003 17:23:17 -0000	1.8
+++ java/awt/image/PixelGrabber.java	26 Dec 2003 17:20:55 -0000
@@ -520,12 +520,16 @@
 		  {
 		    ints_delivered = true;
 
+		    assert (i >= 0 && i < int_pixel_buffer.length);
+		    assert (p >= 0 && p < pixels.length);
 		    int_pixel_buffer[i] = currentModel.getRGB (pixels[p]);
 		  }
 		else
 		  {
 		    bytes_delivered = true;
 
+		    assert (i >= 0 && i < byte_pixel_buffer.length);
+		    assert (p >= 0 && p < pixels.length);
 		    byte_pixel_buffer[i] = pixels[p];
 		  }
 	      }
@@ -578,6 +582,8 @@
 	      {
 		int i = (yp - this.y) * this.scansize + (xp - this.x) + this.offset;
 		int p = (yp - y) * scansize + (xp - x) + offset;
+		assert (i >= 0 && i < int_pixel_buffer.length);
+		assert (p >= 0 && p < pixels.length);
 		if (forceRGB)
 		  int_pixel_buffer[i] = currentModel.getRGB (pixels[p]);
 		else