From e71a33a1facbac76aaf6344692adea7f93a35a81 Mon Sep 17 00:00:00 2001 From: mkoch Date: Mon, 14 Jul 2003 05:33:30 +0000 Subject: 2003-07-14 Michael Koch * java/awt/image/MemoryImageSource.java, java/beans/PropertyEditorManager.java, javax/naming/CompoundName.java, javax/naming/spi/NamingManager.java, javax/swing/AbstractButton.java, javax/swing/ButtonModel.java, javax/swing/SwingUtilities.java, javax/swing/UIManager.java, javax/swing/colorchooser/DefaultColorSelectionModel.java, javax/swing/event/AncestorEvent.java, javax/swing/event/InternalFrameEvent.java, java/util/zip/ZipFile.java: New versions from classpath. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69321 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/awt/image/MemoryImageSource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libjava/java/awt/image/MemoryImageSource.java') diff --git a/libjava/java/awt/image/MemoryImageSource.java b/libjava/java/awt/image/MemoryImageSource.java index 0e8d4620672..5006afe79e5 100644 --- a/libjava/java/awt/image/MemoryImageSource.java +++ b/libjava/java/awt/image/MemoryImageSource.java @@ -74,7 +74,7 @@ public class MemoryImageSource implements ImageProducer this.props = props; int max = (( scansize > width ) ? scansize : width ); pixelb = new byte[ max * height ]; - System.arraycopy( pix, 0, pixelb, 0, max ); + System.arraycopy( pix, 0, pixelb, 0, max * height ); } /** Constructs an ImageProducer from memory @@ -100,7 +100,7 @@ public class MemoryImageSource implements ImageProducer this.props = props; int max = (( scansize > width ) ? scansize : width ); pixeli = new int[ max * height ]; - System.arraycopy( pix, 0, pixeli, 0, max ); + System.arraycopy( pix, 0, pixeli, 0, max * height ); } /** Constructs an ImageProducer from memory using the default RGB ColorModel @@ -226,6 +226,7 @@ public class MemoryImageSource implements ImageProducer if( props != null ) { ic.setProperties( props ); } + ic.setDimensions(width, height); if( pixeli != null ) { ic.setPixels( 0, 0, width, height, cm, pixeli, offset, scansize ); } else { -- cgit v1.2.3