[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] SampleModel/ComponentSampleModel fix
From: |
Thomas Fitzsimmons |
Subject: |
[cp-patches] SampleModel/ComponentSampleModel fix |
Date: |
Sat, 01 Oct 2005 15:30:29 -0400 |
Hi,
I committed a fix for this API problem reported by JAPI.
Tom
2005-10-01 Thomas Fitzsimmons <address@hidden>
* java/awt/image/ComponentSampleModel.java (numBands): Shadow
package-private field in parent class with this protected field.
* java/awt/image/SampleModel.java (numBands): Make field
package-private.
Index: java/awt/image/ComponentSampleModel.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/awt/image/ComponentSampleModel.java,v
retrieving revision 1.7
diff -u -r1.7 ComponentSampleModel.java
--- java/awt/image/ComponentSampleModel.java 2 Jul 2005 20:32:30 -0000
1.7
+++ java/awt/image/ComponentSampleModel.java 1 Oct 2005 18:56:58 -0000
@@ -63,8 +63,9 @@
protected int[] bandOffsets;
protected int[] bankIndices;
- // FIXME: Should we really shadow the numBands in the superclass?
- //protected int numBands;
+ /** Number of bands in the image described. */
+ // This field shadows the package-private numBands in SampleModel.
+ protected int numBands;
/** Used when creating data buffers. */
protected int numBanks;
Index: java/awt/image/SampleModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/SampleModel.java,v
retrieving revision 1.7
diff -u -r1.7 SampleModel.java
--- java/awt/image/SampleModel.java 2 Jul 2005 20:32:36 -0000 1.7
+++ java/awt/image/SampleModel.java 1 Oct 2005 18:56:58 -0000
@@ -47,8 +47,9 @@
/** Height of image described. */
protected int height;
- /** Number of bands in the image described. */
- protected int numBands;
+ /** Number of bands in the image described. Package-private here,
+ shadowed by ComponentSampleModel. */
+ int numBands;
/**
* The DataBuffer type that is used to store the data of the image
- [cp-patches] SampleModel/ComponentSampleModel fix,
Thomas Fitzsimmons <=