From cca83103eed7f82fc8952c15c1f59d345afe4871 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Sun, 7 May 2006 20:48:00 +0000 Subject: 2006-05-06 Sven de Marothy Fixed PR27454 * gnu/java/awt/peer/gtk/GtkImage: (drawPixels,drawPixelsScaled): Check for zero image sizes. --- ChangeLog | 6 ++++++ gnu/java/awt/peer/gtk/GtkImage.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index deed852b8..ae4ab5d72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-06 Sven de Marothy + + Fixed PR27454 + * gnu/java/awt/peer/gtk/GtkImage: (drawPixels,drawPixelsScaled): + Check for zero image sizes. + 2006-05-07 Andrew John Hughes PR classpath/27311: diff --git a/gnu/java/awt/peer/gtk/GtkImage.java b/gnu/java/awt/peer/gtk/GtkImage.java index a8cbbe6c1..5e5f1de01 100644 --- a/gnu/java/awt/peer/gtk/GtkImage.java +++ b/gnu/java/awt/peer/gtk/GtkImage.java @@ -583,6 +583,9 @@ public class GtkImage extends Image srcHeight = height - srcY; } + if ( this.width <= 0 || this.height <= 0 ) + return true; + if ( srcWidth <= 0 || srcHeight <= 0 || dstWidth <= 0 || dstHeight <= 0) return true; @@ -616,6 +619,9 @@ public class GtkImage extends Image if (addObserver(observer)) return false; + if ( this.width <= 0 || this.height <= 0 ) + return true; + synchronized(GdkPixbufDecoder.pixbufLock) { if(bgcolor != null) -- cgit v1.2.1