change functionality according to SVG Feature PR

This commit introduces much new API to bring the disablement flag to the Rasterizer.
ImageDataProvider is ignored for now.

Author: Michael5601

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java

@@ -49,4 +49,10 @@ public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int t
 		return data.get(0);
 	}
 
+	public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int targetZoom, int flag) {
+		List<ElementAtZoom<ImageData>> data = new ImageLoader().load(filename, fileZoom, targetZoom, flag);
+		if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+		return data.get(0);
+	}
+
 }

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataProvider.java

@@ -43,17 +43,17 @@ public interface ImageDataProvider {
 	 */
 	ImageData getImageData (int zoom);
 
-	/**
-	* @since 4.0
-	*/
-	default ImageData getCustomizedImageData(int zoom, int flag) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	* @since 4.0
-	*/
-	default boolean supportsRasterizationFlag(int flag) {
-		return false;
-	}
+//	/**
+//	* @since 4.0
+//	*/
+//	default ImageData getCustomizedImageData(int zoom, int flag) {
+//		throw new UnsupportedOperationException();
+//	}
+//
+//	/**
+//	* @since 4.0
+//	*/
+//	default boolean supportsRasterizationFlag(int flag) {
+//		return false;
+//	}
 }

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java

@@ -162,6 +162,14 @@ List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int target
 	return images;
 }
 
+List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int targetZoom, int flag) {
+	if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	reset();
+	List<ElementAtZoom<ImageData>> images = InternalImageLoader.load(stream, this, fileZoom, targetZoom, flag);
+	data = images.stream().map(ElementAtZoom::element).toArray(ImageData[]::new);
+	return images;
+}
+
 /**
  * Loads an array of <code>ImageData</code> objects from the
  * file with the specified name. Throws an error if either
@@ -195,6 +203,16 @@ List<ElementAtZoom<ImageData>> load(String filename, int fileZoom, int targetZoo
 	return null;
 }
 
+List<ElementAtZoom<ImageData>> load(String filename, int fileZoom, int targetZoom, int flag) {
+	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	try (InputStream stream = new FileInputStream(filename)) {
+		return load(stream, fileZoom, targetZoom, flag);
+	} catch (IOException e) {
+		SWT.error(SWT.ERROR_IO, e);
+	}
+	return null;
+}
+
 /**
  * Saves the image data in this ImageLoader to the specified stream.
  * The format parameter can have one of the following values:

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java

@@ -85,6 +85,11 @@ static abstract class StaticImageFileFormat extends FileFormat {
 		List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom) {
 			return Arrays.stream(loadFromByteStream()).map(d -> new ElementAtZoom<>(d, fileZoom)).toList();
 		}
+
+		@Override
+		List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom, int flag) {
+			return Arrays.stream(loadFromByteStream()).map(d -> new ElementAtZoom<>(d, fileZoom)).toList();
+		}
 	}
 
 	LEDataInputStream inputStream;
@@ -104,6 +109,12 @@ List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom)
 	 */
 	abstract List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom);
 
+	/**
+	 * Format that do not implement {@link StaticImageFileFormat} MUST return
+	 * {@link ImageData} with the specified {@code targetZoom}.
+	 */
+	abstract List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom, int flag);
+
 /**
  * Read the specified input stream, and return the
  * device independent image array represented by the stream.
@@ -122,6 +133,20 @@ public List<ElementAtZoom<ImageData>> loadFromStream(LEDataInputStream stream, i
 	}
 }
 
+public List<ElementAtZoom<ImageData>> loadFromStream(LEDataInputStream stream, int fileZoom, int targetZoom, int flag) {
+	try {
+		inputStream = stream;
+		return loadFromByteStream(fileZoom, targetZoom, flag);
+	} catch (Exception e) {
+		if (e instanceof IOException) {
+			SWT.error(SWT.ERROR_IO, e);
+		} else {
+			SWT.error(SWT.ERROR_INVALID_IMAGE, e);
+		}
+		return null;
+	}
+}
+
 /**
  * Read the specified input stream using the specified loader, and
  * return the device independent image array represented by the stream.
@@ -136,6 +161,20 @@ public static List<ElementAtZoom<ImageData>> load(InputStream is, ImageLoader lo
 	return fileFormat.loadFromStream(stream, fileZoom, targetZoom);
 }
 
+/**
+ * Read the specified input stream using the specified loader, and
+ * return the device independent image array represented by the stream.
+ */
+public static List<ElementAtZoom<ImageData>> load(InputStream is, ImageLoader loader, int fileZoom, int targetZoom, int flag) {
+	LEDataInputStream stream = new LEDataInputStream(is);
+	FileFormat fileFormat = determineFileFormat(stream).orElseGet(() -> {
+		SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+		return null;
+	});
+	fileFormat.loader = loader;
+	return fileFormat.loadFromStream(stream, fileZoom, targetZoom, flag);
+}
+
 /**
  * Write the device independent image array stored in the specified loader
  * to the specified output stream using the specified file format.

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/SVGFileFormat.java

@@ -44,14 +44,19 @@ boolean isFileFormat(LEDataInputStream stream) throws IOException {
 
 	@Override
 	List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom) {
+		return loadFromByteStream(fileZoom, targetZoom, SWT.IMAGE_COPY);
+	}
+
+	@Override
+	List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom, int flag) {
 		if (RASTERIZER == null) {
 			SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
 		}
 		if (targetZoom <= 0) {
 			SWT.error(SWT.ERROR_INVALID_ARGUMENT);
 		}
 		try {
-			ImageData rasterizedImageData = RASTERIZER.rasterizeSVG(inputStream, 100 * targetZoom / fileZoom);
+			ImageData rasterizedImageData = RASTERIZER.rasterizeSVG(inputStream, 100 * targetZoom / fileZoom, flag);
 			return List.of(new ElementAtZoom<>(rasterizedImageData, targetZoom));
 		} catch (IOException e) {
 			SWT.error(SWT.ERROR_INVALID_IMAGE, e);

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

@@ -302,24 +302,14 @@ public Image(Device device, Image srcImage, int flag) {
 }
 
 private boolean createWithSVG(Device device, int flag) {
-	ImageData data = null;
-	Image customizedImage = null;
 	if (imageProvider.getProvider() instanceof ImageFileNameProvider imageFileNameProvider) {
 		ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom(imageFileNameProvider, getZoom());
 		if (fileName.element().endsWith(".svg")) {
-			customizedImage = new Image(device, imageFileNameProvider, flag);
-		}
-	} else if (imageProvider.getProvider() instanceof ImageDataProvider imageDataProvider) {
-		if (imageDataProvider.supportsRasterizationFlag(flag)) {
-			customizedImage = new Image(device, imageDataProvider, flag);
+			ElementAtZoom<ImageData> imageData = ImageDataLoader.load(fileName.element(), fileName.zoom(), getZoom(), flag);
+			init(imageData.element(), getZoom());
+			return true;
 		}
 	}
-	if(customizedImage != null) {
-		data = customizedImage.getImageData(customizedImage.getZoom());
-		init(data, getZoom());
-		customizedImage.dispose();
-		return true;
-	}
 	return false;
 }
 

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

@@ -25,6 +25,10 @@ static List<ElementAtZoom<ImageData>> load(InputStream stream, ImageLoader image
 		return FileFormat.load(stream, imageLoader, fileZoom, targetZoom);
 	}
 
+	static List<ElementAtZoom<ImageData>> load(InputStream stream, ImageLoader imageLoader, int fileZoom, int targetZoom, int flag) {
+		return FileFormat.load(stream, imageLoader, fileZoom, targetZoom, flag);
+	}
+
 	static void save(OutputStream stream, int format, ImageLoader imageLoader) {
 		FileFormat.save(stream, format, imageLoader);
 	}