*** empty log message ***

2 files changed, 4 insertions, 7 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
index 736be5d2e9..121e072d28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
@@ -635,12 +635,10 @@ public ImageData getImageData() {
 		if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 		GdkImage gdkImage = new GdkImage();
 		OS.memmove(gdkImage, gdkImagePtr);
-		byte[] maskData = new byte[gdkImage.bpl * height];
+		byte[] maskData = data.maskData = new byte[gdkImage.bpl * gdkImage.height];
+		data.maskPad = 4;
 		OS.memmove(maskData, gdkImage.mem, maskData.length);
 		OS.g_object_unref(gdkImagePtr);
-
-		data.maskPad = 4;
-		data.maskData = maskData;
 		/* Bit swap the mask data if necessary */
 		if (gdkImage.byte_order == OS.GDK_LSB_FIRST) {
 			for (int i = 0; i < maskData.length; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
index f3412975fd..0c9a549e5c 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
@@ -836,13 +836,12 @@ public ImageData getImageData() {
 		if (xMaskPtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);

 		XImage xMask = new XImage();

 		OS.memmove(xMask, xMaskPtr, XImage.sizeof);

-		data.maskData = new byte[xMask.bytes_per_line * xMask.height];

+		byte[] maskData = data.maskData = new byte[xMask.bytes_per_line * xMask.height];

 		data.maskPad = xMask.bitmap_pad / 8;

-		OS.memmove(data.maskData, xMask.data, data.maskData.length);

+		OS.memmove(maskData, xMask.data, maskData.length);

 		OS.XDestroyImage(xMaskPtr);

 		/* Bit swap the mask data if necessary */

 		if (xMask.bitmap_bit_order == OS.LSBFirst) {

-			byte[] maskData = data.maskData;

 			for (int i = 0; i < maskData.length; i++) {

 				byte b = maskData[i];

 				maskData[i] = (byte)(((b & 0x01) << 7) | ((b & 0x02) << 5) |