From f5c32e10c5eb9656492cb1873386d838266db429 Mon Sep 17 00:00:00 2001 From: Sven de Marothy Date: Wed, 20 Apr 2005 08:09:23 +0200 Subject: [PATCH] 2005-04-20 Sven de Marothy * gnu/java/awt/peer/gtk/GdkGraphics.java: (drawImage): Don't notify the image observer for offscreen images. * gnu/java/awt/peer/gtk/GtkImagePainter.java: (setPixels): Don't notify the image observer. From-SVN: r98446 --- libjava/ChangeLog | 7 ++++++ .../gnu/java/awt/peer/gtk/GdkGraphics.java | 22 ------------------- .../java/awt/peer/gtk/GtkImagePainter.java | 5 ----- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0270724fbe0..0fb344c9e78 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2005-04-20 Sven de Marothy + + * gnu/java/awt/peer/gtk/GdkGraphics.java: + (drawImage): Don't notify the image observer for offscreen images. + * gnu/java/awt/peer/gtk/GtkImagePainter.java: + (setPixels): Don't notify the image observer. + 2005-04-20 Sven de Marothy * java/nio/ByteBufferImpl.java: diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java index c5978ba33af..70b3abca707 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java @@ -147,11 +147,6 @@ public class GdkGraphics extends Graphics int height = img.getHeight (null); copyPixmap (img.getGraphics (), x, y, width, height); - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - x, y, width, height); return true; } @@ -171,12 +166,6 @@ public class GdkGraphics extends Graphics int height = img.getHeight (null); copyPixmap (img.getGraphics (), x, y, width, height); - - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - x, y, width, height); return true; } @@ -197,11 +186,6 @@ public class GdkGraphics extends Graphics copyAndScalePixmap (img.getGraphics (), false, false, 0, 0, img.getWidth (null), img.getHeight (null), x, y, width, height); - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - x, y, width, height); return true; } @@ -286,12 +270,6 @@ public class GdkGraphics extends Graphics copyAndScalePixmap (img.getGraphics (), x_flip, y_flip, sx_start, sy_start, s_width, s_height, dx_start, dy_start, d_width, d_height); - - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - dx_start, dy_start, d_width, d_height); return true; } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImagePainter.java b/libjava/gnu/java/awt/peer/gtk/GtkImagePainter.java index 1e5eb4f6ab3..9f2ecb7dc85 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkImagePainter.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkImagePainter.java @@ -184,11 +184,6 @@ public class GtkImagePainter implements Runnable, ImageConsumer startX + x, startY + y, width, height, convertPixels (pixels, model), offset, scansize, affine); - - if (observer != null) - observer.imageUpdate (image, - ImageObserver.SOMEBITS, - x, y, width, height); } public void -- 2.30.2