(setPixels): Handle (width < scansize).

1 files changed, 13 insertions, 3 deletions

diff --git a/gnu/java/awt/peer/gtk/GtkImage.java b/gnu/java/awt/peer/gtk/GtkImage.java
index f2ff139bd..3c15cf55c 100644
--- a/gnu/java/awt/peer/gtk/GtkImage.java
+++ b/gnu/java/awt/peer/gtk/GtkImage.java
@@ -171,9 +171,19 @@ public class GtkImage extends Image implements ImageConsumer
 	return;
       }
 
-    System.arraycopy (pixels, offset, 
-		      pixelCache, y * this.width + x,
-		      pixels.length - offset);
+    if (scansize == width)
+      {
+	System.arraycopy (pixels, offset, 
+			  pixelCache, y * this.width + x,
+			  pixels.length - offset);
+      }
+    else			// skip over scansize-width for each row
+      {
+	for (int i = 0; i < height; i++)
+	  System.arraycopy (pixels, offset + (i * scansize),
+			    pixelCache, (y + i) * this.width + x,
+			    width);
+      }
   }
 
   public synchronized void