cleanup

Author: Michael5601

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

@@ -352,60 +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 fileZoom the zoom of the file from which the <code>ImageData</code> is loaded
- * @param targetZoom the zoom for the returned <code>ImageData</code> (must be grater than 0)
- *
- * 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 fileZoom, int targetZoom) {
-	ImageData i = ImageDataLoader.load(stream, fileZoom, targetZoom).element();
-	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
@@ -450,56 +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 fileZoom the zoom of the file from which the <code>ImageData</code> is loaded
- * @param targetZoom the zoom for the returned <code>ImageData</code> (must be grater than 0)
- *
- * 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 fileZoom, int targetZoom) {
-	ImageData i = ImageDataLoader.load(filename, fileZoom, targetZoom).element();
-	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

@@ -48,4 +48,5 @@ public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int t
 		if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
 		return data.get(0);
 	}
+
 }

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 {