Utilize FileFormat changes

Author: Michael5601

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

@@ -352,62 +352,6 @@ public ImageData(InputStream stream) {
 		i.delayTime);
 }
 
-/**
- * Constructs an <code>ImageData</code> loaded from the specified
- * input stream. Throws an error if an error occurs while loading
- * the image, or if the image has an unsupported type. Application
- * code is still responsible for closing the input stream.
- *
- * @param stream the input stream to load the image from (must not be null)
- * @param zoom the zoom factor to apply when rasterizing an SVG.
- *
- * A value of 0 means that the standard method for loading should be used.
- * This case is equivalent to calling {@link ImageLoader#load(InputStream)}.
- *
- * A value above 0 specifies a scaling factor for the output image. For example:
- * <ul>
- *   <li>A value of 100 maintains the original size of the SVG when rasterized.</li>
- *   <li>A value of 200 doubles the size of the rasterized image.</li>
- *   <li>A value of 50 reduces the size of the rasterized image to half.</li>
- * </ul>
- * The scaling is applied uniformly to both width and height.
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_IO - if an IO error occurs while reading from the stream</li>
- *    <li>ERROR_INVALID_IMAGE - if the image stream contains invalid data</li>
- *    <li>ERROR_UNSUPPORTED_FORMAT - if the image stream contains an unrecognized format</li>
- * </ul>
- *
- * @see ImageLoader#load(InputStream)
- * @since 3.130
- */
-public ImageData(InputStream stream, int zoom) {
-	ImageData[] data = ImageDataLoader.load(stream, zoom);
-	if (data.length < 1) SWT.error(SWT.ERROR_INVALID_IMAGE);
-	ImageData i = data[0];
-	setAllFields(
-		i.width,
-		i.height,
-		i.depth,
-		i.scanlinePad,
-		i.bytesPerLine,
-		i.data,
-		i.palette,
-		i.transparentPixel,
-		i.maskData,
-		i.maskPad,
-		i.alphaData,
-		i.alpha,
-		i.type,
-		i.x,
-		i.y,
-		i.disposalMethod,
-		i.delayTime);
-}
-
 /**
  * Constructs an <code>ImageData</code> loaded from a file with the
  * specified name. Throws an error if an error occurs loading the
@@ -452,59 +396,6 @@ public ImageData(String filename) {
 		i.delayTime);
 }
 
-/**
- * Constructs an <code>ImageData</code> loaded from a file with the
- * specified name. Throws an error if an error occurs loading the
- * image, or if the image has an unsupported type.
- *
- * @param filename the name of the file to load the image from (must not be null)
- * @param zoom the zoom factor to apply when rasterizing a SVG.
- * A value of 0 means that the standard method for loading should be used.
- * This case is equivalent to calling {@link ImageLoader#load(String)}.
- *
- * A value above 0 specifies a scaling factor for the output image. For example:
- * <ul>
- *   <li>A value of 100 maintains the original size of the SVG when rasterized.</li>
- *   <li>A value of 200 doubles the size of the rasterized image.</li>
- *   <li>A value of 50 reduces the size of the rasterized image to half.</li>
- * </ul>
- * The scaling is applied uniformly to both width and height.
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_IO - if an IO error occurs while reading from the file</li>
- *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data</li>
- *    <li>ERROR_UNSUPPORTED_FORMAT - if the image file contains an unrecognized format</li>
- * </ul>
- *
- * @since 3.130
- */
-public ImageData(String filename, int zoom) {
-	ImageData[] data = ImageDataLoader.load(filename, zoom);
-	if (data.length < 1) SWT.error(SWT.ERROR_INVALID_IMAGE);
-	ImageData i = data[0];
-	setAllFields(
-		i.width,
-		i.height,
-		i.depth,
-		i.scanlinePad,
-		i.bytesPerLine,
-		i.data,
-		i.palette,
-		i.transparentPixel,
-		i.maskData,
-		i.maskPad,
-		i.alphaData,
-		i.alpha,
-		i.type,
-		i.x,
-		i.y,
-		i.disposalMethod,
-		i.delayTime);
-}
-
 /**
  * Prevents uninitialized instances from being created outside the package.
  */

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

@@ -49,8 +49,4 @@ public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int t
 		return data.get(0);
 	}
 
-	public static ImageData[] load(String filename, int zoom) {
-		return new ImageLoader().load(filename, zoom);
-	}
-
 }

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

@@ -162,44 +162,6 @@ List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int target
 	return images;
 }
 
-/**
- * Loads an array of <code>ImageData</code> objects from the
- * specified input stream. If the stream is a SVG File and zoom is not 0,
- * this method will try to rasterize the SVG.
- *
- * @param stream the input stream to load the images from
- * @param zoom the zoom factor to apply when rasterizing a SVG.
- * A value of 0 means that the standard method for loading should be used.
- * This case is equivalent to calling {@link ImageLoader#load(InputStream stream)}.
- *
- * A value above 0 specifies a scaling factor for the output image. For example:
- * <ul>
- *   <li>A value of 100 maintains the original size of the SVG when rasterized.</li>
- *   <li>A value of 200 doubles the size of the rasterized image.</li>
- *   <li>A value of 50 reduces the size of the rasterized image to half.</li>
- * </ul>
- * The scaling is applied uniformly to both width and height.
- *
- * @return an array of <code>ImageData</code> objects loaded from the specified input stream
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_IO - if an IO error occurs while reading from the stream</li>
- *    <li>ERROR_INVALID_IMAGE - if the image stream contains invalid data</li>
- *    <li>ERROR_UNSUPPORTED_FORMAT - if the image stream contains an unrecognized format</li>
- * </ul>
- *
- * @since 3.130
- */
-public ImageData[] load(InputStream stream, int zoom) {
-	if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	reset();
-	data = FileFormat.load(stream, zoom, this);
-	return data;
-}
-
 /**
  * Loads an array of <code>ImageData</code> objects from the
  * file with the specified name. Throws an error if either
@@ -233,49 +195,6 @@ List<ElementAtZoom<ImageData>> load(String filename, int fileZoom, int targetZoo
 	return null;
 }
 
-/**
- * Loads an array of <code>ImageData</code> objects from the
- * file with the specified name. If the filename is a SVG File and zoom is not 0,
- * this method will try to rasterize the SVG. Throws an error if either
- * an error occurs while loading the images, or if the images are
- * not of a supported type. Returns the loaded image data array.
- *
- * @param filename the name of the file to load the images from
- * @param zoom the zoom factor to apply when rasterizing a SVG.
- * A value of 0 means that the standard method for loading should be used.
- * This case is equivalent to calling {@link ImageLoader#load(String)}.
- *
- * A value above 0 specifies a scaling factor for the output image. For example:
- * <ul>
- *   <li>A value of 100 maintains the original size of the SVG when rasterized.</li>
- *   <li>A value of 200 doubles the size of the rasterized image.</li>
- *   <li>A value of 50 reduces the size of the rasterized image to half.</li>
- * </ul>
- * The scaling is applied uniformly to both width and height.
- *
- * @return an array of <code>ImageData</code> objects loaded from the specified file
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>
- * </ul>
- * @exception SWTException <ul>
- *    <li>ERROR_IO - if an IO error occurs while reading from the file</li>
- *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data</li>
- *    <li>ERROR_UNSUPPORTED_FORMAT - if the image file contains an unrecognized format</li>
- * </ul>
- *
- * @since 3.130
- */
-public ImageData[] load(String filename, int zoom) {
-	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	try (InputStream stream = new FileInputStream(filename)) {
-		return load(stream, zoom);
-	} 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

@@ -53,6 +53,9 @@ public abstract class FileFormat {
 		try {
 			FORMAT_FACTORIES.add(OS2BMPFileFormat::new);
 		} catch (NoClassDefFoundError e) { } // ignore format
+		try {
+			FORMAT_FACTORIES.add(SVGFileFormat::new);
+		} catch (NoClassDefFoundError e) { } // ignore format
 	}
 
 	public static final int DEFAULT_ZOOM = 100;
@@ -84,6 +87,16 @@ List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom)
 		}
 	}
 
+	static abstract class DynamicImageFileFormat extends FileFormat {
+
+		abstract ImageData[] loadFromByteStream(int targetZoom);
+
+		@Override
+		List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom) {
+			return Arrays.stream(loadFromByteStream(targetZoom)).map(d -> new ElementAtZoom<>(d, fileZoom)).toList();
+		}
+	}
+
 	LEDataInputStream inputStream;
 	LEDataOutputStream outputStream;
 	ImageLoader loader;
@@ -133,74 +146,6 @@ public static List<ElementAtZoom<ImageData>> load(InputStream is, ImageLoader lo
 	return fileFormat.loadFromStream(stream, fileZoom, targetZoom);
 }
 
-/** The instance of the registered {@link SVGRasterizer}. */
-private static final SVGRasterizer RASTERIZER = ServiceLoader.load(SVGRasterizer.class).findFirst().orElse(null);
-
-
-/**
- * Loads an array of <code>ImageData</code> objects from the specified input stream.
- * Depending on the file type and zoom factor, this method either rasterizes the image
- * (for SVG files) or uses the provided {@link ImageLoader} to load the image data.
- *
- * <p>If the input stream is an SVG file and the specified zoom factor is not 0,
- * the method attempts to rasterize the SVG using the configured rasterizer.
- * Otherwise, it delegates the loading process to the {@link FileFormat#load(InputStream, ImageLoader)} method.
- *
- * @param stream the input stream to load the images from. The stream cannot be null.
- *               If the stream does not support marking, it is wrapped in a
- *               {@link BufferedInputStream}.
- * @param zoom the zoom factor to apply when rasterizing an SVG. A value of 0 uses
- *             the standard image loading method. A positive value specifies a scaling
- *             factor for the output image:
- *             <ul>
- *               <li><code>100</code>: Maintains the original size of the SVG when rasterized.</li>
- *               <li><code>200</code>: Doubles the size of the rasterized image.</li>
- *               <li><code>50</code>: Reduces the size of the rasterized image to half.</li>
- *             </ul>
- *             The scaling factor is applied uniformly to both width and height.
- * @param loader the {@link ImageLoader} instance used to load the image if the
- *               stream is not an SVG or if the zoom factor is 0.
- *
- * @return an array of <code>ImageData</code> objects loaded from the specified
- *         input stream, or <code>null</code> if an error occurs during loading.
- *
- * @exception IllegalArgumentException if the input stream is null.
- * @exception SWTException if an error occurs while loading the image data.
- *
- * @since 3.129
- */
-public static ImageData[] load(InputStream stream, int zoom, ImageLoader loader) {
-	if (stream == null) {
-		throw new IllegalArgumentException("InputStream cannot be null");
-	}
-	if (!stream.markSupported()) {
-		stream = new BufferedInputStream(stream);
-	}
-	try {
-		if (RASTERIZER != null && zoom != 0 && isSVGFile(stream)) {
-			return RASTERIZER.rasterizeSVG(stream, zoom);
-		} else {
-			return loader.load(stream);
-		}
-	} catch (IOException e) {
-		SWT.error(SWT.ERROR_INVALID_IMAGE, e);
-	}
-	return null;
-}
-
-private static boolean isSVGFile(InputStream stream) throws IOException {
-	if (stream == null) {
-		throw new IllegalArgumentException("InputStream cannot be null");
-	}
-	stream.mark(1);
-	try {
-		int firstByte = stream.read();
-		return firstByte == '<';
-	} finally {
-		stream.reset();
-	}
-}
-
 /**
  * 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

@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Vector Informatik GmbH and others.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors: Michael Bangas (Vector Informatik GmbH) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.image;
+
+import java.io.*;
+import java.nio.charset.*;
+import java.util.*;
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.image.FileFormat.*;
+
+public class SVGFileFormat extends DynamicImageFileFormat {
+
+	/** The instance of the registered {@link SVGRasterizer}. */
+	private static final SVGRasterizer RASTERIZER = ServiceLoader.load(SVGRasterizer.class).findFirst().orElse(null);
+
+	@Override
+	boolean isFileFormat(LEDataInputStream stream) throws IOException {
+		byte[] firstBytes = new byte[5];
+	    int bytesRead = stream.read(firstBytes);
+	    stream.unread(firstBytes);
+	    String header = new String(firstBytes, 0, bytesRead, StandardCharsets.UTF_8).trim();
+	    return header.startsWith("<?xml") || header.startsWith("<svg");
+	}
+
+	@Override
+	ImageData[] loadFromByteStream(int targetZoom) {
+		try {
+			if (RASTERIZER != null && targetZoom != 0) {
+				return RASTERIZER.rasterizeSVG(inputStream, targetZoom);
+			}
+		} catch (IOException e) {
+			SWT.error(SWT.ERROR_INVALID_IMAGE, e);
+		}
+		return null;
+	}
+
+	@Override
+	void unloadIntoByteStream(ImageLoader loader) {
+		throw new UnsupportedOperationException();
+	}
+}

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

@@ -1149,7 +1149,7 @@ public ImageData getImageData (int zoom) {
 		return DPIUtil.scaleImageData (device, data.element(), zoom, data.zoom());
 	} else if (imageFileNameProvider != null) {
 		ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom (imageFileNameProvider, zoom);
-		return DPIUtil.scaleImageData (device, new ImageData (fileName.element(), currentDeviceZoom), zoom, fileName.zoom());
+		return DPIUtil.scaleImageData (device, new ImageData (fileName.element()), zoom, fileName.zoom());
 	} else if (imageGcDrawer != null) {
 		return drawWithImageGcDrawer(width, height, zoom);
 	} else {