diff --git a/bundles/org.eclipse.swt.svg/.classpath b/bundles/org.eclipse.swt.svg/.classpath new file mode 100644 index 00000000000..7e80fa54e17 --- /dev/null +++ b/bundles/org.eclipse.swt.svg/.classpath @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.swt.svg/.project b/bundles/org.eclipse.swt.svg/.project new file mode 100644 index 00000000000..587ce542c7c --- /dev/null +++ b/bundles/org.eclipse.swt.svg/.project @@ -0,0 +1,28 @@ + + + org.eclipse.swt.svg + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/bundles/org.eclipse.swt.svg/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.swt.svg/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..99f26c0203a --- /dev/null +++ b/bundles/org.eclipse.swt.svg/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/org.eclipse.swt.svg/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt.svg/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..4b76983c5f1 --- /dev/null +++ b/bundles/org.eclipse.swt.svg/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,10 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.incompleteClasspath=warning diff --git a/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..46eab990081 --- /dev/null +++ b/bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SvgPlugin +Bundle-SymbolicName: org.eclipse.swt.svg +Bundle-Version: 1.0.0.qualifier +Automatic-Module-Name: org.eclipse.swt.svgPlugin +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Fragment-Host: org.eclipse.swt +Export-Package: org.eclipse.swt.svg +Bundle-ClassPath: ., libs/jsvg-1.6.1.jar diff --git a/bundles/org.eclipse.swt.svg/META-INF/services/org.eclipse.swt.graphics.SVGRasterizer b/bundles/org.eclipse.swt.svg/META-INF/services/org.eclipse.swt.graphics.SVGRasterizer new file mode 100644 index 00000000000..bd95b6eea89 --- /dev/null +++ b/bundles/org.eclipse.swt.svg/META-INF/services/org.eclipse.swt.graphics.SVGRasterizer @@ -0,0 +1 @@ +org.eclipse.swt.svg.JSVGRasterizer diff --git a/bundles/org.eclipse.swt.svg/build.properties b/bundles/org.eclipse.swt.svg/build.properties new file mode 100644 index 00000000000..3c7f762fff8 --- /dev/null +++ b/bundles/org.eclipse.swt.svg/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + libs/jsvg-1.6.1.jar diff --git a/bundles/org.eclipse.swt.svg/libs/jsvg-1.6.1.jar b/bundles/org.eclipse.swt.svg/libs/jsvg-1.6.1.jar new file mode 100644 index 00000000000..3095291a853 Binary files /dev/null and b/bundles/org.eclipse.swt.svg/libs/jsvg-1.6.1.jar differ diff --git a/bundles/org.eclipse.swt.svg/src/org/eclipse/swt/svg/JSVGRasterizer.java b/bundles/org.eclipse.swt.svg/src/org/eclipse/swt/svg/JSVGRasterizer.java new file mode 100644 index 00000000000..22b21268f90 --- /dev/null +++ b/bundles/org.eclipse.swt.svg/src/org/eclipse/swt/svg/JSVGRasterizer.java @@ -0,0 +1,166 @@ +/******************************************************************************* + * 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.svg; + +import static java.awt.RenderingHints.*; + +import java.awt.*; +import java.awt.image.*; +import java.io.*; +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 com.github.weisj.jsvg.*; +import com.github.weisj.jsvg.geometry.size.*; +import com.github.weisj.jsvg.parser.*; + +/** + * A rasterizer implementation for converting SVG data into rasterized images. + * This class implements the {@code ISVGRasterizer} interface. + * + * @since 1.0.0 + */ +public class JSVGRasterizer implements SVGRasterizer { + + private SVGLoader svgLoader; + + private final static Map RENDERING_HINTS = Map.of(KEY_ANTIALIASING, VALUE_ANTIALIAS_ON, // + KEY_ALPHA_INTERPOLATION, VALUE_ALPHA_INTERPOLATION_QUALITY, // + KEY_COLOR_RENDERING, VALUE_COLOR_RENDER_QUALITY, // + KEY_DITHERING, VALUE_DITHER_DISABLE, // + KEY_FRACTIONALMETRICS, VALUE_FRACTIONALMETRICS_ON, // + KEY_INTERPOLATION, VALUE_INTERPOLATION_BICUBIC, // + KEY_RENDERING, VALUE_RENDER_QUALITY, // + KEY_STROKE_CONTROL, VALUE_STROKE_PURE, // + KEY_TEXT_ANTIALIASING, VALUE_TEXT_ANTIALIAS_ON // + ); + + @Override + public ImageData rasterizeSVG(InputStream stream, float scalingFactor) throws IOException { + if (stream == null) { + throw new IllegalArgumentException("InputStream cannot be null"); + } + stream.mark(Integer.MAX_VALUE); + if(svgLoader == null) { + svgLoader = new SVGLoader(); + } + SVGDocument svgDocument = null; + InputStream nonClosingStream = new FilterInputStream(stream) { + @Override + public void close() throws IOException { + // Do nothing to prevent closing the underlying stream + } + }; + svgDocument = svgLoader.load(nonClosingStream, null, LoaderContext.createDefault()); + stream.reset(); + if (svgDocument != null) { + FloatSize size = svgDocument.size(); + double originalWidth = size.getWidth(); + double originalHeight = size.getHeight(); + int scaledWidth = (int) Math.round(originalWidth * scalingFactor); + int scaledHeight = (int) Math.round(originalHeight * scalingFactor); + BufferedImage image = new BufferedImage(scaledWidth, scaledHeight, BufferedImage.TYPE_INT_ARGB); + Graphics2D g = image.createGraphics(); + g.setRenderingHints(RENDERING_HINTS); + g.scale(scalingFactor, scalingFactor); + svgDocument.render(null, g); + g.dispose(); + return convertToSWT(image); + } + return null; + } + + private ImageData convertToSWT(BufferedImage bufferedImage) { + if (bufferedImage.getColorModel() instanceof DirectColorModel) { + DirectColorModel colorModel = (DirectColorModel)bufferedImage.getColorModel(); + PaletteData palette = new PaletteData( + colorModel.getRedMask(), + colorModel.getGreenMask(), + colorModel.getBlueMask()); + ImageData data = new ImageData(bufferedImage.getWidth(), bufferedImage.getHeight(), + colorModel.getPixelSize(), palette); + for (int y = 0; y < data.height; y++) { + for (int x = 0; x < data.width; x++) { + int rgb = bufferedImage.getRGB(x, y); + int pixel = palette.getPixel(new RGB((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF)); + data.setPixel(x, y, pixel); + if (colorModel.hasAlpha()) { + data.setAlpha(x, y, (rgb >> 24) & 0xFF); + } + } + } + return data; + } + else if (bufferedImage.getColorModel() instanceof IndexColorModel) { + IndexColorModel colorModel = (IndexColorModel)bufferedImage.getColorModel(); + int size = colorModel.getMapSize(); + byte[] reds = new byte[size]; + byte[] greens = new byte[size]; + byte[] blues = new byte[size]; + colorModel.getReds(reds); + colorModel.getGreens(greens); + colorModel.getBlues(blues); + RGB[] rgbs = new RGB[size]; + for (int i = 0; i < rgbs.length; i++) { + rgbs[i] = new RGB(reds[i] & 0xFF, greens[i] & 0xFF, blues[i] & 0xFF); + } + PaletteData palette = new PaletteData(rgbs); + ImageData data = new ImageData(bufferedImage.getWidth(), bufferedImage.getHeight(), + colorModel.getPixelSize(), palette); + data.transparentPixel = colorModel.getTransparentPixel(); + WritableRaster raster = bufferedImage.getRaster(); + int[] pixelArray = new int[1]; + for (int y = 0; y < data.height; y++) { + for (int x = 0; x < data.width; x++) { + raster.getPixel(x, y, pixelArray); + data.setPixel(x, y, pixelArray[0]); + } + } + return data; + } + else if (bufferedImage.getColorModel() instanceof ComponentColorModel) { + ComponentColorModel colorModel = (ComponentColorModel)bufferedImage.getColorModel(); + //ASSUMES: 3 BYTE BGR IMAGE TYPE + PaletteData palette = new PaletteData(0x0000FF, 0x00FF00,0xFF0000); + ImageData data = new ImageData(bufferedImage.getWidth(), bufferedImage.getHeight(), + colorModel.getPixelSize(), palette); + //This is valid because we are using a 3-byte Data model with no transparent pixels + data.transparentPixel = -1; + WritableRaster raster = bufferedImage.getRaster(); + int[] pixelArray = new int[3]; + for (int y = 0; y < data.height; y++) { + for (int x = 0; x < data.width; x++) { + raster.getPixel(x, y, pixelArray); + int pixel = palette.getPixel(new RGB(pixelArray[0], pixelArray[1], pixelArray[2])); + data.setPixel(x, y, pixel); + } + } + return data; + } + return null; + } + + public boolean isSVGFile(InputStream stream) throws IOException { + if (stream == null) { + throw new IllegalArgumentException("InputStream cannot be null"); + } + stream.mark(Integer.MAX_VALUE); + try { + int firstByte = stream.read(); + return firstByte == '<'; + } finally { + stream.reset(); + } + } +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java index 5b063ab2e78..6d1ca19b532 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java @@ -14,9 +14,12 @@ package org.eclipse.swt.graphics; +import java.awt.image.BufferedImage; import java.io.*; import java.util.*; +import javax.imageio.ImageIO; + import org.eclipse.swt.*; import org.eclipse.swt.internal.image.*; @@ -149,10 +152,61 @@ void reset() { * */ public ImageData[] load(InputStream stream) { + return loadDefault(stream); +} + +/** + * Loads an array of ImageData 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. + * 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 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. + * @return an array of ImageData objects loaded from the specified input stream + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +public ImageData[] load(InputStream stream, int zoom) { + if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + reset(); + if (!stream.markSupported()) { + stream = new BufferedInputStream(stream); + } + SVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); + if (rasterizer != null && zoom != 0) { + try { + if (rasterizer.isSVGFile(stream)) { + float scalingFactor = zoom / 100.0f; + ImageData rasterizedData = rasterizer.rasterizeSVG(stream, scalingFactor); + if (rasterizedData != null) { + data = new ImageData[]{rasterizedData}; + return data; + } + } + } catch (IOException e) { + //ignore. + } + } + return loadDefault(stream); +} + +private ImageData[] loadDefault(InputStream stream) { if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); reset(); data = FileFormat.load(stream, this); - return data; + return data; } /** @@ -175,18 +229,43 @@ public ImageData[] load(InputStream stream) { */ public ImageData[] load(String filename) { if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - InputStream stream = null; - try { - stream = new FileInputStream(filename); - return load(stream); + try (InputStream stream = new FileInputStream(filename)) { + return loadDefault(stream); + } catch (IOException e) { + SWT.error(SWT.ERROR_IO, e); + } + return null; +} + +/** + * Loads an array of ImageData 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. + * @return an array of ImageData objects loaded from the specified file + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +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); - } finally { - try { - if (stream != null) stream.close(); - } catch (IOException e) { - // Ignore error - } } return null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java index c268e5caaed..a0d03843db1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java @@ -331,7 +331,39 @@ scanlinePad, checkData(data), 0, null, * @see ImageLoader#load(InputStream) */ public ImageData(InputStream stream) { - ImageData[] data = ImageDataLoader.load(stream); + this(stream, 0); +} + +/** + * Constructs an ImageData 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. + *

+ * This constructor is provided for convenience when loading a single + * image only. If the stream contains multiple images, only the first + * one will be loaded. To load multiple images, use + * ImageLoader.load(). + *

+ * + * @param stream the input stream 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. + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @see ImageLoader#load(InputStream) + * @since 3.129 + */ +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( @@ -377,7 +409,36 @@ public ImageData(InputStream stream) { * */ public ImageData(String filename) { - ImageData[] data = ImageDataLoader.load(filename); + this(filename, 0); +} + +/** + * Constructs an ImageData 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. + *

+ * This constructor is provided for convenience when loading a single + * image only. If the file contains multiple images, only the first + * one will be loaded. To load multiple images, use + * ImageLoader.load(). + *

+ * + * @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. + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +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( diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java index b1fe23d2472..9c9da788bfa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java @@ -25,8 +25,16 @@ public static ImageData[] load(InputStream stream) { return new ImageLoader().load(stream); } - public static ImageData[] load(String filename) { + public static ImageData[] load(InputStream stream, int zoom) { + return new ImageLoader().load(stream, zoom); + } + + public static ImageData[] load(String filename) { return new ImageLoader().load(filename); } + public static ImageData[] load(String filename, int zoom) { + return new ImageLoader().load(filename, zoom); + } + } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SVGRasterizer.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SVGRasterizer.java new file mode 100644 index 00000000000..82dc18e9174 --- /dev/null +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SVGRasterizer.java @@ -0,0 +1,48 @@ +/******************************************************************************* + * 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.graphics; + +import java.io.*; + +/** + * Defines the interface for an SVG rasterizer, responsible for converting SVG + * data into rasterized images. + * + * @since 3.129 + */ +public interface SVGRasterizer { + + /** + * Rasterizes an SVG image from the provided byte array, using the specified + * zoom factor. + * + * @param stream the SVG image as an {@link InputStream}. + * @param scalingFactor the scaling ratio e.g. 2.0 for doubled size. + * @return the {@link ImageData} for the rasterized image, or + * {@code null} if the input is not a valid SVG file or cannot be + * processed. + * @throws IOException if an error occurs while reading the SVG data. + */ + public ImageData rasterizeSVG(InputStream stream, float scalingFactor) throws IOException; + + /** + * Determines whether the given {@link InputStream} contains a SVG file. + * + * @param stream 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 stream) throws IOException; + //TODO: use optional above instead? +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SVGRasterizerRegistry.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SVGRasterizerRegistry.java new file mode 100644 index 00000000000..62af6436744 --- /dev/null +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SVGRasterizerRegistry.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * 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.graphics; + +import java.util.*; + +/** + * A registry for managing the instance of an {@link SVGRasterizer} implementation. + * This allows for the registration and retrieval of a single rasterizer instance. + * + * @since 3.129 + */ +class SVGRasterizerRegistry { + + /** + * The instance of the registered {@link SVGRasterizer}. + */ + private static final SVGRasterizer RASTERIZER = ServiceLoader.load(SVGRasterizer.class).findFirst().orElse(null); + + /** + * Retrieves the currently registered {@link SVGRasterizer} implementation. + * + * @return the registered {@link SVGRasterizer}, or {@code null} if no implementation + * has been registered. + */ + public static SVGRasterizer getRasterizer() { + return RASTERIZER; + } +} \ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java index 4fbda1029d7..bc531b30184 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java @@ -15,10 +15,13 @@ package org.eclipse.swt.graphics; +import java.awt.image.BufferedImage; import java.io.*; import java.util.*; import java.util.List; +import javax.imageio.ImageIO; + import org.eclipse.swt.*; import org.eclipse.swt.internal.*; import org.eclipse.swt.internal.gtk.*; @@ -159,11 +162,61 @@ void reset() { * */ public ImageData[] load(InputStream stream) { + return loadDefault(stream); +} + +/** + * Loads an array of ImageData 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. + * 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 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. + * @return an array of ImageData objects loaded from the specified input stream + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +public ImageData[] load(InputStream stream, int zoom) { + if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + reset(); + if (!stream.markSupported()) { + stream = new BufferedInputStream(stream); + } + SVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); + if (rasterizer != null && zoom != 0) { + try { + if (rasterizer.isSVGFile(stream)) { + float scalingFactor = zoom / 100.0f; + ImageData rasterizedData = rasterizer.rasterizeSVG(stream, scalingFactor); + if (rasterizedData != null) { + data = new ImageData[]{rasterizedData}; + return data; + } + } + } catch (IOException e) { + //ignore. + } + } + return loadDefault(stream); +} + +private ImageData[] loadDefault(InputStream stream) { if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); reset(); - ImageData [] imgDataArray = getImageDataArrayFromStream(stream); - data = imgDataArray; - return imgDataArray; + data = getImageDataArrayFromStream(stream); + return data; } /** @@ -291,18 +344,43 @@ boolean isInterlacedPNG(byte [] imageAsByteArray) { */ public ImageData[] load(String filename) { if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - InputStream stream = null; - try { - stream = new FileInputStream(filename); - return load(stream); + try (InputStream stream = new FileInputStream(filename)) { + return loadDefault(stream); + } catch (IOException e) { + SWT.error(SWT.ERROR_IO, e); + } + return null; +} + +/** + * Loads an array of ImageData 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. + * @return an array of ImageData objects loaded from the specified file + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +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); - } finally { - try { - if (stream != null) stream.close(); - } catch (IOException e) { - // Ignore error - } } return null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index a171623b2f0..49f77917231 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -463,7 +463,7 @@ public Image(Device device, ImageData source, ImageData mask) { public Image (Device device, InputStream stream) { super(device); initialNativeZoom = DPIUtil.getNativeDeviceZoom(); - ImageData data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(new ImageData (stream), 100)); + ImageData data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(new ImageData (stream, getZoom()), 100)); init(data, getZoom()); init(); this.device.registerResourceWithZoomSupport(this); @@ -505,7 +505,7 @@ public Image (Device device, String filename) { super(device); if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); initialNativeZoom = DPIUtil.getNativeDeviceZoom(); - ImageData data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(new ImageData (filename), 100)); + ImageData data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(new ImageData (filename, getZoom()), 100)); init(data, getZoom()); init(); this.device.registerResourceWithZoomSupport(this); @@ -548,10 +548,10 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) { if (fileName.zoom() == getZoom()) { ImageHandle imageMetadata = initNative (fileName.element(), getZoom()); if (imageMetadata == null) { - init(new ImageData (fileName.element()), getZoom()); + init(new ImageData (fileName.element(), getZoom()), getZoom()); } } else { - ImageData resizedData = DPIUtil.autoScaleImageData (device, new ImageData (fileName.element()), fileName.zoom()); + ImageData resizedData = DPIUtil.autoScaleImageData (device, new ImageData (fileName.element(), getZoom()), fileName.zoom()); init(resizedData, getZoom()); } init(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java index a8e4c2f684c..29a1decc627 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java @@ -149,10 +149,61 @@ void reset() { * */ public ImageData[] load(InputStream stream) { + return loadDefault(stream); +} + +/** + * Loads an array of ImageData 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. + * 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 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. + * @return an array of ImageData objects loaded from the specified input stream + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +public ImageData[] load(InputStream stream, int zoom) { + if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + reset(); + if (!stream.markSupported()) { + stream = new BufferedInputStream(stream); + } + SVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer(); + if (rasterizer != null && zoom != 0) { + try { + if (rasterizer.isSVGFile(stream)) { + float scalingFactor = zoom / 100.0f; + ImageData rasterizedData = rasterizer.rasterizeSVG(stream, scalingFactor); + if (rasterizedData != null) { + data = new ImageData[]{rasterizedData}; + return data; + } + } + } catch (IOException e) { + SWT.error(SWT.ERROR_INVALID_IMAGE); + } + } + return loadDefault(stream); +} + +private ImageData[] loadDefault(InputStream stream) { if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); reset(); data = FileFormat.load(stream, this); - return data; + return data; } /** @@ -176,7 +227,40 @@ public ImageData[] load(InputStream stream) { public ImageData[] load(String filename) { if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); try (InputStream stream = new FileInputStream(filename)) { - return load(stream); + return loadDefault(stream); + } catch (IOException e) { + SWT.error(SWT.ERROR_IO, e); + } + return null; +} + +/** + * Loads an array of ImageData 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. + * @return an array of ImageData objects loaded from the specified file + * + * @exception IllegalArgumentException + * @exception SWTException + * + * @since 3.129 + */ +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); } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_SVGRasterizer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_SVGRasterizer.java new file mode 100644 index 00000000000..eb2249c10dc --- /dev/null +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_SVGRasterizer.java @@ -0,0 +1,93 @@ +package org.eclipse.swt.tests.junit; + +import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem; +import static org.junit.Assert.fail; + +import java.io.File; +import java.net.URL; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.SWTException; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.ImageData; +import org.eclipse.swt.graphics.ImageDataProvider; +import org.eclipse.swt.graphics.ImageFileNameProvider; +import org.eclipse.swt.widgets.Display; +import org.junit.Before; +import org.junit.Test; + +public class Test_org_eclipse_swt_graphics_SVGRasterizer { + Display display; + + ImageFileNameProvider imageFileNameProvider = zoom -> { + String fileName = "collapseall.svg"; + return getPath(fileName); + }; + + ImageDataProvider imageDataProvider = zoom -> { + String fileName = "collapseall.svg"; + return new ImageData(getPath(fileName), zoom); + }; + + @Before + public void setUp() { + display = Display.getDefault(); + } + + String getPath(String fileName) { + String urlPath; + String pluginPath = System.getProperty("PLUGIN_PATH"); + if (pluginPath == null) { + URL url = getClass().getClassLoader().getResource(fileName); + if (url == null) { + fail("URL == null for file " + fileName); + } + urlPath = url.getFile(); + } else { + urlPath = pluginPath + "/data/" + fileName; + } + + if (File.separatorChar != '/') urlPath = urlPath.replace('/', File.separatorChar); + if (SwtTestUtil.isWindows && urlPath.indexOf(File.separatorChar) == 0) urlPath = urlPath.substring(1); + urlPath = urlPath.replaceAll("%20", " "); + return urlPath; + } + + @Test + public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvider() { + // Valid provider + Image image = new Image(display, imageFileNameProvider); + image.dispose(); + // Corrupt Image provider + ImageFileNameProvider provider = zoom -> { + String fileName = "corrupt.svg"; + return getPath(fileName); + }; + try { + image = new Image(display, provider); + image.dispose(); + fail("No exception thrown for corrupt image file."); + } catch (SWTException e) { + assertSWTProblem("Incorrect exception thrown for provider with corrupt images", SWT.ERROR_INVALID_IMAGE, e); + } + } + + @Test + public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageDataProvider() { + // Valid provider + Image image = new Image(display, imageDataProvider); + image.dispose(); + // Corrupt Image provider + ImageDataProvider provider = zoom -> { + String fileName = "corrupt.svg"; + return new ImageData(getPath(fileName), zoom); + }; + try { + image = new Image(display, provider); + image.dispose(); + fail("No exception thrown for corrupt image file."); + } catch (SWTException e) { + assertSWTProblem("Incorrect exception thrown for provider with corrupt images", SWT.ERROR_INVALID_IMAGE, e); + } + } +} diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/collapseall.svg b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/collapseall.svg new file mode 100644 index 00000000000..587c3c3497e --- /dev/null +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/collapseall.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/corrupt.svg b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/corrupt.svg new file mode 100644 index 00000000000..edac6e7e9f2 --- /dev/null +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/corrupt.svg @@ -0,0 +1,210 @@ + + + +< inkscape:version="0.91 r13725" + sodipodi:docname="collapseall.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.swt.tests/data/collapseall.svg b/tests/org.eclipse.swt.tests/data/collapseall.svg new file mode 100644 index 00000000000..587c3c3497e --- /dev/null +++ b/tests/org.eclipse.swt.tests/data/collapseall.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.swt.tests/data/corrupt.svg b/tests/org.eclipse.swt.tests/data/corrupt.svg new file mode 100644 index 00000000000..edac6e7e9f2 --- /dev/null +++ b/tests/org.eclipse.swt.tests/data/corrupt.svg @@ -0,0 +1,210 @@ + + + +< inkscape:version="0.91 r13725" + sodipodi:docname="collapseall.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + +