Delegating Image(Display, String) to ImageFileNameProvider to init Image

In GTK and Cocoa, an image based on an SVG passed as filename to Image(Device, String) will be drawn now sharply with this change.

Resolves: #2917

Author: ShahzaibIbrahim

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

@@ -736,19 +736,11 @@ public Image(Device device, InputStream stream) {
  */
 public Image(Device device, String filename) {
 	super(device);
-	NSAutoreleasePool pool = null;
-	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
-	try {
-		if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		initNative(filename);
-		if (this.handle == null) {
-			initWithSupplier(zoom -> ImageDataLoader.canLoadAtZoom(filename, FileFormat.DEFAULT_ZOOM, zoom),
-					zoom -> ImageDataLoader.loadByZoom(filename, FileFormat.DEFAULT_ZOOM, zoom).element());
-		}
-		init();
-	} finally {
-		if (pool != null) pool.release();
-	}
+	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	ImageFileNameProvider imageFileNameProvider = (ImageFileNameProvider) zoom -> {
+		return zoom == 100 ? filename : null;
+	};
+	initUsingFileNameProvider(imageFileNameProvider);
 }
 
 /**
@@ -783,6 +775,10 @@ public Image(Device device, String filename) {
 public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	super(device);
 	if (imageFileNameProvider == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	initUsingFileNameProvider(imageFileNameProvider);
+}
+
+private void initUsingFileNameProvider(ImageFileNameProvider imageFileNameProvider) {
 	this.imageFileNameProvider = imageFileNameProvider;
 	String filename = imageFileNameProvider.getImagePath(100);
 	if (filename == null) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

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

@@ -597,9 +597,10 @@ public Image(Device device, String filename) {
 	super(device);
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	currentDeviceZoom = DPIUtil.getDeviceZoom();
-	ElementAtZoom<ImageData> image = ImageDataLoader.loadByZoom(filename, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
-	ImageData data = DPIUtil.scaleImageData(device, image, currentDeviceZoom);
-	init(data);
+	this.imageFileNameProvider = (ImageFileNameProvider) zoom -> {
+		return zoom == 100 ? filename : null;
+	};
+	initFromFileNameProvider(currentDeviceZoom);
 	init();
 }