diff options
Diffstat (limited to 'libjava/java/awt/image/BufferedImage.java')
| -rw-r--r-- | libjava/java/awt/image/BufferedImage.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/libjava/java/awt/image/BufferedImage.java b/libjava/java/awt/image/BufferedImage.java index 1fd7b9bfcf5..8c6ead242a5 100644 --- a/libjava/java/awt/image/BufferedImage.java +++ b/libjava/java/awt/image/BufferedImage.java @@ -267,9 +267,16 @@ public class BufferedImage extends Image raster.createWritableChild(x, y, w, h, x, y, null // same bands ); - - // Refer to ComponentDataBlitOp for optimized data blitting: - ComponentDataBlitOp.INSTANCE.filter(src, dest); + if (src.getSampleModel () instanceof ComponentSampleModel + && dest.getSampleModel () instanceof ComponentSampleModel) + // Refer to ComponentDataBlitOp for optimized data blitting: + ComponentDataBlitOp.INSTANCE.filter(src, dest); + else + { + // slower path + int samples[] = src.getPixels (x, y, w, h, (int [])null); + dest.setPixels (x, y, w, h, samples); + } return dest; } @@ -540,9 +547,18 @@ public class BufferedImage extends Image raster.createWritableChild(x, y, w, h, x, y, null // same bands ); - - // Refer to ComponentDataBlitOp for optimized data blitting: - ComponentDataBlitOp.INSTANCE.filter(src, dest); + + if (src.getSampleModel () instanceof ComponentSampleModel + && dest.getSampleModel () instanceof ComponentSampleModel) + + // Refer to ComponentDataBlitOp for optimized data blitting: + ComponentDataBlitOp.INSTANCE.filter(src, dest); + else + { + // slower path + int samples[] = src.getPixels (x, y, w, h, (int [])null); + dest.setPixels (x, y, w, h, samples); + } } public void setRGB(int x, int y, int argb) |