Image type SWT.ICON loses its type during re-scale

Image initialized as SWT.ICON in
org.eclipse.swt.graphics.Image.Image(Device, ImageData, ImageData) loses
its "Icon" properties i.e. type, mask etc. when handle for different
zoom level is requested. Now implementing correct init method when the
handle is requested for image type ICON.

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java

@@ -783,7 +783,11 @@ private ImageHandle getImageMetadata(int zoom) {
 	} else {
 		ImageData resizedData = getImageData(zoom);
 		ImageData newData = adaptImageDataIfDisabledOrGray(resizedData);
-		init(newData, zoom);
+		if(type == SWT.ICON) {
+			init(this.device, this, newData, newData.getTransparencyMask(), zoom);
+		} else {
+			init(newData, zoom);
+		}
 		init();
 	}
 	return zoomLevelToImageHandle.get(zoom);

tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/graphics/ImageWin32Tests.java

@@ -16,7 +16,9 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.internal.DPIUtil;
 import org.eclipse.swt.widgets.Display;
 import org.junit.Before;
@@ -63,5 +65,20 @@ public void testImageShouldHaveDimesionAsPerZoomLevel() {
 		} finally {
 			image.dispose();
 		}
-}
-}
+	}
+
+	@Test
+	public void testImageIconTypeShouldNotChangeAfterCallingGetHandleForDifferentZoom() {
+		Image image = new Image(display, 10, 10);
+		int iconTypeAfter = SWT.DEFAULT;
+		try {
+			ImageData mask = image.getImageData().getTransparencyMask();
+			Image icon = new Image(display, image.getImageData(), mask);
+			Image.win32_getHandle(icon, 200);
+			iconTypeAfter = icon.type;
+		} catch (Exception e) {
+			fail("test image could not be initialized: " + e);
+		}
+		assertEquals("Image type should stay to SWT.ICON", SWT.ICON, iconTypeAfter);
+	}
+}