From d8edb24158d3d06776f8886c9b973fc1c232c28e Mon Sep 17 00:00:00 2001 From: mkoch Date: Tue, 4 May 2004 19:27:11 +0000 Subject: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81486 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/awt/image/ColorModel.java | 8 ++++++-- libjava/java/awt/image/ComponentSampleModel.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'libjava/java/awt/image') diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java index 767b83f7dd0..c73f4fd4e58 100644 --- a/libjava/java/awt/image/ColorModel.java +++ b/libjava/java/awt/image/ColorModel.java @@ -166,7 +166,7 @@ public abstract class ColorModel implements Transparency */ public static ColorModel getRGBdefault() { - return new DirectColorModel(8, 0xff0000, 0xff00, 0xff, 0xff000000); + return new DirectColorModel(32, 0xff0000, 0xff00, 0xff, 0xff000000); } public final boolean hasAlpha() @@ -597,7 +597,11 @@ public abstract class ColorModel implements Transparency return null; } - // Typically overridden + /** + * Checks if the given raster has a compatible data-layout (SampleModel). + * @param raster The Raster to test. + * @return true if raster is compatible. + */ public boolean isCompatibleRaster(Raster raster) { SampleModel sampleModel = raster.getSampleModel(); diff --git a/libjava/java/awt/image/ComponentSampleModel.java b/libjava/java/awt/image/ComponentSampleModel.java index 0a40161adeb..c7b08b919e5 100644 --- a/libjava/java/awt/image/ComponentSampleModel.java +++ b/libjava/java/awt/image/ComponentSampleModel.java @@ -349,7 +349,7 @@ public class ComponentSampleModel extends SampleModel if (scanlineStride == rowSize) { // Collapse scan lines: - scanlineStride = rowSize *= h; + rowSize *= h; h = 1; } -- cgit v1.2.3