diff options
Diffstat (limited to 'libjava/classpath/java/awt/image')
9 files changed, 29 insertions, 25 deletions
diff --git a/libjava/classpath/java/awt/image/BandedSampleModel.java b/libjava/classpath/java/awt/image/BandedSampleModel.java index afe62bdc4bd..94dbd8d4669 100644 --- a/libjava/classpath/java/awt/image/BandedSampleModel.java +++ b/libjava/classpath/java/awt/image/BandedSampleModel.java @@ -37,6 +37,7 @@ exception statement from your version. */ package java.awt.image; import gnu.java.awt.Buffers; +import gnu.java.lang.CPStringBuilder; /** * A sample model that reads each sample value from a separate band in the @@ -742,7 +743,7 @@ public final class BandedSampleModel extends ComponentSampleModel */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("["); result.append("scanlineStride=").append(scanlineStride); diff --git a/libjava/classpath/java/awt/image/BufferedImage.java b/libjava/classpath/java/awt/image/BufferedImage.java index 78623ccd928..260d254fd65 100644 --- a/libjava/classpath/java/awt/image/BufferedImage.java +++ b/libjava/classpath/java/awt/image/BufferedImage.java @@ -41,6 +41,8 @@ package java.awt.image; import gnu.java.awt.Buffers; import gnu.java.awt.ClasspathGraphicsEnvironment; import gnu.java.awt.ComponentDataBlitOp; +import gnu.java.lang.CPStringBuilder; + import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GraphicsEnvironment; @@ -778,9 +780,9 @@ public class BufferedImage extends Image public String toString() { - StringBuffer buf; + CPStringBuilder buf; - buf = new StringBuffer(/* estimated length */ 120); + buf = new CPStringBuilder(/* estimated length */ 120); buf.append("BufferedImage@"); buf.append(Integer.toHexString(hashCode())); buf.append(": type="); diff --git a/libjava/classpath/java/awt/image/ColorModel.java b/libjava/classpath/java/awt/image/ColorModel.java index e2873c5d71f..005b8d45ffe 100644 --- a/libjava/classpath/java/awt/image/ColorModel.java +++ b/libjava/classpath/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/libjava/classpath/java/awt/image/ComponentColorModel.java b/libjava/classpath/java/awt/image/ComponentColorModel.java index 2096800b20d..e1e85e1912a 100644 --- a/libjava/classpath/java/awt/image/ComponentColorModel.java +++ b/libjava/classpath/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/libjava/classpath/java/awt/image/DirectColorModel.java b/libjava/classpath/java/awt/image/DirectColorModel.java index dab15319fce..3d43c764237 100644 --- a/libjava/classpath/java/awt/image/DirectColorModel.java +++ b/libjava/classpath/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(), diff --git a/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java b/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java index 8732e57659e..8db26b52d42 100644 --- a/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java +++ b/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java @@ -37,6 +37,7 @@ exception statement from your version. */ package java.awt.image; import gnu.java.awt.Buffers; +import gnu.java.lang.CPStringBuilder; /** * MultiPixelPackedSampleModel provides a single band model that supports @@ -587,7 +588,7 @@ public class MultiPixelPackedSampleModel extends SampleModel */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("["); result.append("scanlineStride=").append(scanlineStride); diff --git a/libjava/classpath/java/awt/image/Raster.java b/libjava/classpath/java/awt/image/Raster.java index fb0950dabf3..615155fb3f9 100644 --- a/libjava/classpath/java/awt/image/Raster.java +++ b/libjava/classpath/java/awt/image/Raster.java @@ -37,6 +37,8 @@ exception statement from your version. */ package java.awt.image; +import gnu.java.lang.CPStringBuilder; + import java.awt.Point; import java.awt.Rectangle; @@ -920,7 +922,7 @@ public class Raster */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("[("); diff --git a/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java b/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java index 1b0ac3f7904..22513865197 100644 --- a/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java +++ b/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java @@ -39,6 +39,7 @@ package java.awt.image; import java.util.Arrays; import gnu.java.awt.BitMaskExtent; +import gnu.java.lang.CPStringBuilder; /** * A <code>SampleModel</code> used when all samples are stored in a single @@ -569,7 +570,7 @@ public class SinglePixelPackedSampleModel extends SampleModel */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); result.append(getClass().getName()); result.append("["); result.append("scanlineStride=").append(scanlineStride); diff --git a/libjava/classpath/java/awt/image/WritableRaster.java b/libjava/classpath/java/awt/image/WritableRaster.java index bf8db140c7f..02789a3d142 100644 --- a/libjava/classpath/java/awt/image/WritableRaster.java +++ b/libjava/classpath/java/awt/image/WritableRaster.java @@ -111,13 +111,8 @@ public class WritableRaster extends Raster public WritableRaster createWritableTranslatedChild(int childMinX, int childMinY) { - // This mirrors the code from the super class - int tcx = sampleModelTranslateX - minX + childMinX; - int tcy = sampleModelTranslateY - minY + childMinY; - - return new WritableRaster(sampleModel, dataBuffer, - new Rectangle(childMinX, childMinY, width, height), - new Point(tcx, tcy), this); + return createWritableChild(minX, minY, width, height, + childMinX, childMinY, null); } /** @@ -143,12 +138,14 @@ public class WritableRaster extends Raster SampleModel sm = (bandList == null) ? sampleModel : sampleModel.createSubsetSampleModel(bandList); - - return new WritableRaster(sm, dataBuffer, - new Rectangle(childMinX, childMinY, w, h), - new Point(sampleModelTranslateX + childMinX - parentX, - sampleModelTranslateY + childMinY - parentY), - this); + + return new WritableRaster(sm, getDataBuffer(), + new Rectangle(childMinX, childMinY, w, h), + new Point(sampleModelTranslateX + childMinX - + parentX, + sampleModelTranslateY + childMinY - + parentY), + this); } public Raster createChild(int parentX, int parentY, int width, |
