From 27c2c3ec4ac46015d9a616c2aafe30fd1b5582ab Mon Sep 17 00:00:00 2001 From: Ingo Proetel Date: Tue, 4 May 2004 19:27:11 +0000 Subject: ColorModel.java (getRGBdefault): Default ColorModel has 32 bit pixels not 8 bit pixels. 2004-05-04 Ingo Proetel * java/awt/image/ColorModel.java (getRGBdefault): Default ColorModel has 32 bit pixels not 8 bit pixels. (isCompatibleRaster): Added javadoc comment. 2004-05-04 Ingo Proetel * java/awt/image/ComponentSampleModel.java (setDataSamples):Do not reset scanline stride. 2004-05-04 Ingo Proetel * java/awt/ColorPaintContext.java (): Added ColorModel to signature. (getColorModel): Return the actual color model. (getRaster): Implemented. (ColorRaster): New inner class. * java/awt/SystemColor.java (createContext): Use ColorModel when creating a PaintContext. * java/awt/Color.java (): Make exception more verbose. (createContext): Use ColorModel when creating a PaintContext. From-SVN: r81486 --- libjava/java/awt/SystemColor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/java/awt/SystemColor.java') diff --git a/libjava/java/awt/SystemColor.java b/libjava/java/awt/SystemColor.java index c6bffe2101a..5217677b722 100644 --- a/libjava/java/awt/SystemColor.java +++ b/libjava/java/awt/SystemColor.java @@ -427,7 +427,7 @@ public final class SystemColor extends Color implements Serializable * as the system color is solid, the context does not need any of the * passed parameters to do its job. * - * @param cm the requested color model, ignored + * @param cm the requested color model * @param deviceBounds the bounding box in device coordinates, ignored * @param userBounds the bounding box in user coordinates, ignored * @param xform the bounds transformation, ignored @@ -441,8 +441,8 @@ public final class SystemColor extends Color implements Serializable { Toolkit.getDefaultToolkit().loadSystemColors(colors); int color = colors[value] | ALPHA_MASK; - if (context == null || color != context.color) - context = new ColorPaintContext(color); + if (context == null || color != context.color || !context.getColorModel().equals(cm)) + context = new ColorPaintContext(cm,color); return context; } -- cgit v1.2.3