diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-03-25 19:13:04 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-03-25 19:13:04 +0000 |
| commit | a0bd928790d91ce8fd497e3f7cfbe999edef42d7 (patch) | |
| tree | e337b526646cb55d07ae637ef08b3c619b055ba4 /java | |
| parent | 5ee269d8b73238a1973965749d5c418c82506fd1 (diff) | |
| download | classpath-a0bd928790d91ce8fd497e3f7cfbe999edef42d7.tar.gz | |
2008-03-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* 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.
Diffstat (limited to 'java')
| -rw-r--r-- | java/awt/image/ColorModel.java | 4 | ||||
| -rw-r--r-- | java/awt/image/ComponentColorModel.java | 2 | ||||
| -rw-r--r-- | java/awt/image/DirectColorModel.java | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/java/awt/image/ColorModel.java b/java/awt/image/ColorModel.java index e2873c5d7..005b8d45f 100644 --- a/java/awt/image/ColorModel.java +++ b/java/awt/image/ColorModel.java @@ -631,8 +631,8 @@ public abstract class ColorModel implements Transparency throw new UnsupportedOperationException(); } - protected void coerceDataWorker(WritableRaster raster, - boolean isAlphaPremultiplied) + void coerceDataWorker(WritableRaster raster, + boolean isAlphaPremultiplied) { int w = raster.getWidth(); int h = raster.getHeight(); diff --git a/java/awt/image/ComponentColorModel.java b/java/awt/image/ComponentColorModel.java index 2096800b2..e1e85e191 100644 --- a/java/awt/image/ComponentColorModel.java +++ b/java/awt/image/ComponentColorModel.java @@ -312,7 +312,7 @@ public class ComponentColorModel extends ColorModel /* 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); diff --git a/java/awt/image/DirectColorModel.java b/java/awt/image/DirectColorModel.java index dab15319f..3d43c7642 100644 --- a/java/awt/image/DirectColorModel.java +++ b/java/awt/image/DirectColorModel.java @@ -393,8 +393,8 @@ public class DirectColorModel extends PackedColorModel 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 PackedColorModel /* 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(), |