----- Forwarded message from ----- To: classpath-patches@gnu.org Subject: FYI: Fix JAPI errors in visibility
These fixes some small visibility errors in the java.awt.image classes.
ChangeLog:
2008-03-25 Andrew John Hughes <[EMAIL PROTECTED]>
* java/awt/image/ColorModel.java:
(coerceDataWorker(WritableRaster,boolean)):
Make package-private, not protected.
* java/awt/image/ComponentColorModel.java:
Call coerceDataWorker directly.
* java/awt/image/DirectColorModel.java:
Likewise.
(coerceData(WritableRaster,boolean)): Made final.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: java/awt/image/ColorModel.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/ColorModel.java,v
retrieving revision 1.35
diff -u -3 -p -u -r1.35 ColorModel.java
--- java/awt/image/ColorModel.java 10 Oct 2006 15:15:22 -0000 1.35
+++ java/awt/image/ColorModel.java 25 Mar 2008 19:04:02 -0000
@@ -631,8 +631,8 @@ public abstract class ColorModel impleme
throw new UnsupportedOperationException();
}
- protected void coerceDataWorker(WritableRaster raster,
- boolean isAlphaPremultiplied)
+ void coerceDataWorker(WritableRaster raster,
+ boolean isAlphaPremultiplied)
{
int w = raster.getWidth();
int h = raster.getHeight();
Index: java/awt/image/ComponentColorModel.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/ComponentColorModel.java,v
retrieving revision 1.11
diff -u -3 -p -u -r1.11 ComponentColorModel.java
--- java/awt/image/ComponentColorModel.java 25 Sep 2006 15:38:42 -0000
1.11
+++ java/awt/image/ComponentColorModel.java 25 Mar 2008 19:04:02 -0000
@@ -312,7 +312,7 @@ public class ComponentColorModel extends
/* TODO: provide better implementation based on the
assumptions we can make due to the specific type of the
color model. */
- super.coerceDataWorker(raster, isAlphaPremultiplied);
+ coerceDataWorker(raster, isAlphaPremultiplied);
return new ComponentColorModel(cspace, hasAlpha, isAlphaPremultiplied,
transparency, transferType);
Index: java/awt/image/DirectColorModel.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/DirectColorModel.java,v
retrieving revision 1.19
diff -u -3 -p -u -r1.19 DirectColorModel.java
--- java/awt/image/DirectColorModel.java 25 Sep 2006 15:38:42 -0000
1.19
+++ java/awt/image/DirectColorModel.java 25 Mar 2008 19:04:02 -0000
@@ -393,8 +393,8 @@ public class DirectColorModel extends Pa
return Buffers.getData(buffer);
}
- public ColorModel coerceData (WritableRaster raster,
- boolean isAlphaPremultiplied)
+ public final ColorModel coerceData (WritableRaster raster,
+ boolean isAlphaPremultiplied)
{
if (this.isAlphaPremultiplied == isAlphaPremultiplied || !hasAlpha())
return this;
@@ -402,7 +402,7 @@ public class DirectColorModel extends Pa
/* TODO: provide better implementation based on the
assumptions we can make due to the specific type of the
color model. */
- super.coerceDataWorker(raster, isAlphaPremultiplied);
+ coerceDataWorker(raster, isAlphaPremultiplied);
return new DirectColorModel(cspace, pixel_bits, getRedMask(),
getGreenMask(), getBlueMask(), getAlphaMask(),
----- End forwarded message -----
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
signature.asc
Description: Digital signature
