Remove SVGUtil and move utility methods into JSVGRasterizer

Author: Michael5601

bundles/org.eclipse.swt.svg/src/org/eclipse/swt/svg/JSVGRasterizer.java

@@ -16,13 +16,13 @@
 import java.awt.*;
 import java.awt.image.*;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import org.eclipse.swt.graphics.SVGRasterizer;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.PaletteData;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.SVGRasterizerRegistry;
-import org.eclipse.swt.graphics.SVGUtil;
 
 import com.github.weisj.jsvg.*;
 import com.github.weisj.jsvg.geometry.size.*;
@@ -63,7 +63,7 @@ public ImageData rasterizeSVG(byte[] bytes, float scalingFactor) throws IOExcept
 			svgLoader = new SVGLoader();
 		}
 		SVGDocument svgDocument = null;
-		if (SVGUtil.isSVGFile(bytes)) {
+		if (isSVGFile(bytes)) {
 			try (InputStream stream = new ByteArrayInputStream(bytes)) {
 				svgDocument = svgLoader.load(stream, null, LoaderContext.createDefault());
 			}
@@ -154,4 +154,17 @@ else if (bufferedImage.getColorModel() instanceof ComponentColorModel) {
 	    }
 	    return null;
 	}
+
+	private boolean isSVGFile(byte[] data) throws IOException {
+		String content = new String(data, 0, Math.min(data.length, 512), StandardCharsets.UTF_8);
+		return content.contains("<svg");
+	}
+
+	public boolean isSVGFile(InputStream inputStream) throws IOException {
+		if (inputStream == null) {
+			throw new IllegalArgumentException("InputStream cannot be null");
+		}
+		byte[] data = inputStream.readNBytes(512);
+		return isSVGFile(data);
+	}
 }

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

@@ -34,4 +34,14 @@ public interface SVGRasterizer {
 	 */
 	public ImageData rasterizeSVG(byte[] bytes, float scalingFactor) throws IOException;
 
+	/**
+	 * Determines whether the given {@link InputStream} contains a SVG file.
+	 *
+	 * @param inputStream the input stream to check.
+	 * @return {@code true} if the input stream contains SVG content; {@code false}
+	 *         otherwise.
+	 * @throws IOException              if an error occurs while reading the stream.
+	 * @throws IllegalArgumentException if the input stream is {@code null}.
+	 */
+	public boolean isSVGFile(InputStream inputStream) throws IOException;
 }