summaryrefslogtreecommitdiff
path: root/libjava/java/awt/SystemColor.java
diff options
context:
space:
mode:
authorIngo Proetel <proetel@aicas.com>2004-05-04 19:27:11 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-05-04 19:27:11 +0000
commit27c2c3ec4ac46015d9a616c2aafe30fd1b5582ab (patch)
tree4945426aed8ab42ddbdcb6975ef386280d1ec7a5 /libjava/java/awt/SystemColor.java
parentfae4c98f1b61242c3e20ba4580a991b94080423a (diff)
ColorModel.java (getRGBdefault): Default ColorModel has 32 bit pixels not 8 bit pixels.
2004-05-04 Ingo Proetel <proetel@aicas.com> * 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 <proetel@aicas.com> * java/awt/image/ComponentSampleModel.java (setDataSamples):Do not reset scanline stride. 2004-05-04 Ingo Proetel <proetel@aicas.com> * java/awt/ColorPaintContext.java (<init>): 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 (<init>): Make exception more verbose. (createContext): Use ColorModel when creating a PaintContext. From-SVN: r81486
Diffstat (limited to 'libjava/java/awt/SystemColor.java')
-rw-r--r--libjava/java/awt/SystemColor.java6
1 files changed, 3 insertions, 3 deletions
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;
}