Hi,
This fixes the coerceData method in java.awt.image.ColorModel and its
relevant subclasses.
Cheers,
Francis
2006-09-21 Francis Kung <[EMAIL PROTECTED]>
* java/awt/image/ColorModel.java (coerceData): Return proper colour
model.
* java/awt/image/ComponentColorModel.java (coerceData): Likewise.
* java/awt/image/DirectColorModel.java (coerceData): Likewise.
Index: java/awt/image/DirectColorModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/DirectColorModel.java,v
retrieving revision 1.17
diff -u -r1.17 DirectColorModel.java
--- java/awt/image/DirectColorModel.java 1 Apr 2006 23:16:21 -0000 1.17
+++ java/awt/image/DirectColorModel.java 21 Sep 2006 21:46:29 -0000
@@ -402,11 +402,7 @@
/* TODO: provide better implementation based on the
assumptions we can make due to the specific type of the
color model. */
- super.coerceData(raster, isAlphaPremultiplied);
-
- return new ComponentColorModel(cspace, bits, hasAlpha(),
- isAlphaPremultiplied, // argument
- transparency, transferType);
+ return super.coerceData(raster, isAlphaPremultiplied);
}
public boolean isCompatibleRaster(Raster raster)
Index: java/awt/image/ColorModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/ColorModel.java,v
retrieving revision 1.31
diff -u -r1.31 ColorModel.java
--- java/awt/image/ColorModel.java 14 Aug 2006 16:14:53 -0000 1.31
+++ java/awt/image/ColorModel.java 21 Sep 2006 21:46:28 -0000
@@ -656,8 +656,7 @@
raster.setPixels(0, 0, w, h, pixels);
- // FIXME: what can we return?
- return null;
+ return this;
}
/**
Index: java/awt/image/ComponentColorModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/ComponentColorModel.java,v
retrieving revision 1.9
diff -u -r1.9 ComponentColorModel.java
--- java/awt/image/ComponentColorModel.java 24 Aug 2006 15:49:55 -0000 1.9
+++ java/awt/image/ComponentColorModel.java 21 Sep 2006 21:46:28 -0000
@@ -312,11 +312,7 @@
/* TODO: provide better implementation based on the
assumptions we can make due to the specific type of the
color model. */
- super.coerceData(raster, isAlphaPremultiplied);
-
- return new ComponentColorModel(cspace, bits, hasAlpha(),
- isAlphaPremultiplied, // argument
- transparency, transferType);
+ return super.coerceData(raster, isAlphaPremultiplied);
}
public boolean isCompatibleRaster(Raster raster)
