summaryrefslogtreecommitdiff
path: root/java/awt/image
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-03-28 18:47:49 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-03-28 18:47:49 +0000
commit39087c1c9526674767766fb723023483736b70f7 (patch)
tree7b2df83c556d8382648cf834ca9ff8896f062306 /java/awt/image
parent04584c32ab98eb03c4d5306697133ebfc77707da (diff)
downloadclasspath-39087c1c9526674767766fb723023483736b70f7.tar.gz
2005-03-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge of HEAD --> generics-branch for 2005/03/23-2005/03/28. Changelog: 2005-03-28 Sven de Marothy <sven@physto.se> * gnu/java/io/decode/DecoderUnicodeBig.java, * gnu/java/io/decode/DecoderUnicodeLittle.java, * gnu/java/io/encode/EncoderUnicodeBig.java, * gnu/java/io/encode/EncoderUnicodeLittle.java: New files. 2005-03-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * doc/hacking.texinfo: Added note on reserved word usage. 2005-03-26 Dalibor Topic <robilad@kaffe.org> * native/jni/java-nio/gnu_java_nio_VMSelector.c: Moved include statement for config.h to the top to fix the build on Darwin6. Reported by: Riccardo Mottola <zuse@libero.it> 2005-03-26 Dalibor Topic <robilad@kaffe.org> * native/jni/java-nio/gnu_java_nio_VMSelector.c: Include <sys/types.h> to fix build on OS X. Reported by: Michael Franz <mvfranz@gmail.com> 2005-03-26 Ito Kazumitsu <kaz@maczuka.gcd.org> * java/text/DecimalFormat.java (parse): Check whether the positive suffix matches the pattern. 2005-03-26 Chris Burdess <dog@gnu.org> * gnu/xml/dom/DomNode.java (notifyNode): grow listener array as required. 2005-03-26 Jeroen Frijters <jeroen@frijters.net> * javax/imageio/spi/IIORegistry.java (IIORegistry): Don't assume that awt Toolkit is always ClasspathToolkit. 2005-03-26 Jeroen Frijters <jeroen@frijters.net> * java/awt/image/PixelGrabber.java (setPixels(int,int,int,int, ColorModel,byte[],int,int): Fixed byte to int conversion.
Diffstat (limited to 'java/awt/image')
-rw-r--r--java/awt/image/PixelGrabber.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/awt/image/PixelGrabber.java b/java/awt/image/PixelGrabber.java
index da50d1f70..9a68a0847 100644
--- a/java/awt/image/PixelGrabber.java
+++ b/java/awt/image/PixelGrabber.java
@@ -520,7 +520,7 @@ public class PixelGrabber implements ImageConsumer
{
ints_delivered = true;
- int_pixel_buffer[i] = currentModel.getRGB (pixels[p]);
+ int_pixel_buffer[i] = currentModel.getRGB (pixels[p] & 0xFF);
}
else
{