Fix zoom-aware Image initialization on Linux and Windows

Author: HeikoKlare

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

@@ -532,9 +532,7 @@ public Image(Device device, ImageData source, ImageData mask) {
 public Image(Device device, InputStream stream) {
 	super(device);
 	currentDeviceZoom = DPIUtil.getDeviceZoom();
-	// FIXME: is this the right zoom? That's what is done in windows Image.getZoom()?
-	int zoom = DPIUtil.getZoomForAutoscaleProperty(currentDeviceZoom);
-	ElementAtZoom<ImageData> image = ImageDataLoader.load(stream, FileFormat.DEFAULT_ZOOM, zoom);
+	ElementAtZoom<ImageData> image = ImageDataLoader.load(stream, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
 	ImageData data = DPIUtil.autoScaleUp(device, image);
 	init(data);
 	init();
@@ -576,9 +574,7 @@ public Image(Device device, String filename) {
 	super(device);
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	currentDeviceZoom = DPIUtil.getDeviceZoom();
-	// FIXME: is this the right zoom? That's what is done in windows Image.getZoom()?
-	int zoom = DPIUtil.getZoomForAutoscaleProperty(currentDeviceZoom);
-	ElementAtZoom<ImageData> image = ImageDataLoader.load(filename, FileFormat.DEFAULT_ZOOM, zoom);
+	ElementAtZoom<ImageData> image = ImageDataLoader.load(filename, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
 	ImageData data = DPIUtil.autoScaleUp(device, image);
 	init(data);
 	init();
@@ -617,17 +613,18 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	super(device);
 	this.imageFileNameProvider = imageFileNameProvider;
 	currentDeviceZoom = DPIUtil.getDeviceZoom();
-	ElementAtZoom<String> filename = DPIUtil.validateAndGetImagePathAtZoom (imageFileNameProvider, currentDeviceZoom);
-	ElementAtZoom<ImageData> imageData = ImageDataLoader.load(filename.element(), filename.zoom(), currentDeviceZoom);
-	if (imageData.zoom() == currentDeviceZoom) {
-		initNative (filename.element());
-
-		if (this.surface == 0) {
+	ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom (imageFileNameProvider, currentDeviceZoom);
+	if (fileName.zoom() == currentDeviceZoom) {
+		initNative(fileName.element());
+	}
+	if (this.surface == 0) {
+		ElementAtZoom<ImageData> imageData = ImageDataLoader.load(fileName.element(), fileName.zoom(), currentDeviceZoom);
+		if (imageData.zoom() == currentDeviceZoom) {
 			init(imageData.element());
+		} else {
+			ImageData resizedData = DPIUtil.autoScaleUp(device, imageData);
+			init(resizedData);
 		}
-	} else {
-		ImageData resizedData = DPIUtil.autoScaleUp(device, imageData);
-		init(resizedData);
 	}
 	init ();
 }

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

@@ -557,16 +557,20 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
 	int deviceZoom = getZoom();
 	ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom(imageFileNameProvider, deviceZoom);
-	ElementAtZoom<ImageData> imageData = ImageDataLoader.load(fileName.element(), fileName.zoom(), deviceZoom);
-	if (imageData.zoom() == deviceZoom) {
-		ImageHandle imageMetadata = initNative(fileName.element(), deviceZoom);
-		if (imageMetadata == null) {
+	ImageHandle nativeImageMetadata = null;
+	if (fileName.zoom() == deviceZoom) {
+		nativeImageMetadata = initNative(fileName.element(), deviceZoom);
+	}
+	if (nativeImageMetadata == null) {
+		ElementAtZoom<ImageData> imageData = ImageDataLoader.load(fileName.element(), fileName.zoom(), deviceZoom);
+		if (imageData.zoom() == deviceZoom) {
 			init(imageData.element(), deviceZoom);
+		} else {
+			ImageData resizedData = DPIUtil.autoScaleUp(device, imageData);
+			init(resizedData, deviceZoom);
 		}
-	} else {
-		ImageData resizedData = DPIUtil.autoScaleUp(device, imageData);
-		init(resizedData, deviceZoom);
 	}
+
 	init();
 	this.device.registerResourceWithZoomSupport(this);
 }