merge new API (flag parameter) into existing API

Michael5601 · Michael5601 · commit 6a243516673c · 2025-03-24T09:51:26.000+01:00
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
@@ -37,14 +37,8 @@ public static ImageData load(String filename) {
 		return data[0];
 	}
 
-	public static ElementAtZoom<ImageData> load(InputStream stream, int fileZoom, int targetZoom) {
-		List<ElementAtZoom<ImageData>> data = new ImageLoader().load(stream, fileZoom, targetZoom);
-		if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
-		return data.get(0);
-	}
-
-	public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int targetZoom) {
-		List<ElementAtZoom<ImageData>> data = new ImageLoader().load(filename, fileZoom, targetZoom);
+	public static ElementAtZoom<ImageData> load(InputStream stream, int fileZoom, int targetZoom, int flag) {
+		List<ElementAtZoom<ImageData>> data = new ImageLoader().load(stream, fileZoom, targetZoom, flag);
 		if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
 		return data.get(0);
 	}
@@ -54,5 +48,4 @@ public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int t
 		if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
 		return data.get(0);
 	}
-
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java
@@ -150,18 +150,10 @@ void reset() {
  * </ul>
  */
 public ImageData[] load(InputStream stream) {
-	load(stream, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM);
+	load(stream, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM, SWT.IMAGE_COPY);
 	return data;
 }
 
-List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int targetZoom) {
-	if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	reset();
-	List<ElementAtZoom<ImageData>> images = InternalImageLoader.load(stream, this, fileZoom, targetZoom);
-	data = images.stream().map(ElementAtZoom::element).toArray(ImageData[]::new);
-	return images;
-}
-
 List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int targetZoom, int flag) {
 	if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	reset();
@@ -189,20 +181,10 @@ List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int target
  * </ul>
  */
 public ImageData[] load(String filename) {
-	load(filename, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM);
+	load(filename, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM, SWT.IMAGE_COPY);
 	return data;
 }
 
-List<ElementAtZoom<ImageData>> load(String filename, int fileZoom, int targetZoom) {
-	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	try (InputStream stream = new FileInputStream(filename)) {
-		return load(stream, fileZoom, targetZoom);
-	} catch (IOException e) {
-		SWT.error(SWT.ERROR_IO, e);
-	}
-	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)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java
@@ -83,11 +83,6 @@ static abstract class StaticImageFileFormat extends FileFormat {
 
 		abstract ImageData[] loadFromByteStream();
 
-		@Override
-		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) {
 			switch (flag) {
@@ -242,12 +237,6 @@ private ImageData applyGrayImageData(ImageData data, int pHeight, int pWidth) {
 	 */
 	abstract boolean isFileFormat(LEDataInputStream stream) throws IOException;
 
-	/**
-	 * 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);
-
 	/**
 	 * Format that do not implement {@link StaticImageFileFormat} MUST return
 	 * {@link ImageData} with the specified {@code targetZoom}.
@@ -258,20 +247,6 @@ private ImageData applyGrayImageData(ImageData data, int pHeight, int pWidth) {
  * Read the specified input stream, and return the
  * device independent image array represented by the stream.
  */
-public List<ElementAtZoom<ImageData>> loadFromStream(LEDataInputStream stream, int fileZoom, int targetZoom) {
-	try {
-		inputStream = stream;
-		return loadFromByteStream(fileZoom, targetZoom);
-	} catch (Exception e) {
-		if (e instanceof IOException) {
-			SWT.error(SWT.ERROR_IO, e);
-		} else {
-			SWT.error(SWT.ERROR_INVALID_IMAGE, e);
-		}
-		return null;
-	}
-}
-
 public List<ElementAtZoom<ImageData>> loadFromStream(LEDataInputStream stream, int fileZoom, int targetZoom, int flag) {
 	try {
 		inputStream = stream;
@@ -286,20 +261,6 @@ public List<ElementAtZoom<ImageData>> loadFromStream(LEDataInputStream stream, i
 	}
 }
 
-/**
- * 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) {
-	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);
-}
-
 /**
  * Read the specified input stream using the specified loader, and
  * return the device independent image array represented by the stream.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/SVGFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/SVGFileFormat.java
@@ -42,11 +42,6 @@ boolean isFileFormat(LEDataInputStream stream) throws IOException {
 		return header.startsWith("<?xml") || header.startsWith("<svg");
 	}
 
-	@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) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java
@@ -133,7 +133,7 @@ ImageData loadIcon(int[] iconHeader) {
 		StaticImageFileFormat png = new PNGFileFormat();
 		if (png.isFileFormat(inputStream)) {
 			png.loader = this.loader;
-			return png.loadFromStream(inputStream, DEFAULT_ZOOM, DEFAULT_ZOOM).get(0).element();
+			return png.loadFromStream(inputStream, DEFAULT_ZOOM, DEFAULT_ZOOM, SWT.IMAGE_COPY).get(0).element();
 		}
 	} catch (Exception e) {
 	}
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
@@ -513,7 +513,7 @@ public Image (Device device, InputStream stream) {
 	super(device);
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
 	int deviceZoom = getZoom();
-	ElementAtZoom<ImageData> imageCandidate = ImageDataLoader.load(stream, FileFormat.DEFAULT_ZOOM, deviceZoom);
+	ElementAtZoom<ImageData> imageCandidate = ImageDataLoader.load(stream, FileFormat.DEFAULT_ZOOM, deviceZoom, SWT.IMAGE_COPY);
 	ImageData data = scaleImageData(imageCandidate.element(), deviceZoom, imageCandidate.zoom());
 	init(data, deviceZoom);
 	init();
@@ -557,7 +557,7 @@ public Image (Device device, String filename) {
 	if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
 	int deviceZoom = getZoom();
-	ElementAtZoom<ImageData> imageCandidate = ImageDataLoader.load(filename, FileFormat.DEFAULT_ZOOM, deviceZoom);
+	ElementAtZoom<ImageData> imageCandidate = ImageDataLoader.load(filename, FileFormat.DEFAULT_ZOOM, deviceZoom, SWT.IMAGE_COPY);
 	ImageData data = scaleImageData(imageCandidate.element(), deviceZoom, imageCandidate.zoom());
 	init(data, deviceZoom);
 	init();
@@ -2129,7 +2129,7 @@ ImageData getImageData(int zoom) {
 
 		ElementAtZoom<ImageData> imageDataAtZoom;
 		if (nativeInitializedImage == null) {
-			imageDataAtZoom = ImageDataLoader.load(fileForZoom.element(), fileForZoom.zoom(), zoom);
+			imageDataAtZoom = ImageDataLoader.load(fileForZoom.element(), fileForZoom.zoom(), zoom, SWT.IMAGE_COPY);
 		} else {
 			imageDataAtZoom = new ElementAtZoom<>(nativeInitializedImage.getImageData(), fileForZoom.zoom());
 			destroyHandleForZoom(zoom);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/InternalImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/InternalImageLoader.java
@@ -21,10 +21,6 @@
 
 class InternalImageLoader {
 
-	static List<ElementAtZoom<ImageData>> load(InputStream stream, ImageLoader imageLoader, int fileZoom, int targetZoom) {
-		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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,8 @@ public static ImageData load(String filename) {`
`37`	`37`	`return data[0];`
`38`	`38`	`}`
`39`	`39`
`40`		`- public static ElementAtZoom<ImageData> load(InputStream stream, int fileZoom, int targetZoom) {`
`41`		`- List<ElementAtZoom<ImageData>> data = new ImageLoader().load(stream, fileZoom, targetZoom);`
`42`		`- if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);`
`43`		`- return data.get(0);`
`44`		`- }`
`45`		`-`
`46`		`- public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int targetZoom) {`
`47`		`- List<ElementAtZoom<ImageData>> data = new ImageLoader().load(filename, fileZoom, targetZoom);`
	`40`	`+ public static ElementAtZoom<ImageData> load(InputStream stream, int fileZoom, int targetZoom, int flag) {`
	`41`	`+ List<ElementAtZoom<ImageData>> data = new ImageLoader().load(stream, fileZoom, targetZoom, flag);`
`48`	`42`	`if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);`
`49`	`43`	`return data.get(0);`
`50`	`44`	`}`
`@@ -54,5 +48,4 @@ public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int t`
`54`	`48`	`if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);`
`55`	`49`	`return data.get(0);`
`56`	`50`	`}`
`57`		`-`
`58`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ ImageData loadIcon(int[] iconHeader) {`
`133`	`133`	`StaticImageFileFormat png = new PNGFileFormat();`
`134`	`134`	`if (png.isFileFormat(inputStream)) {`
`135`	`135`	`png.loader = this.loader;`
`136`		`- return png.loadFromStream(inputStream, DEFAULT_ZOOM, DEFAULT_ZOOM).get(0).element();`
	`136`	`+ return png.loadFromStream(inputStream, DEFAULT_ZOOM, DEFAULT_ZOOM, SWT.IMAGE_COPY).get(0).element();`
`137`	`137`	`}`
`138`	`138`	`} catch (Exception e) {`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@`
`21`	`21`
`22`	`22`	`class InternalImageLoader {`
`23`	`23`
`24`		`- static List<ElementAtZoom<ImageData>> load(InputStream stream, ImageLoader imageLoader, int fileZoom, int targetZoom) {`
`25`		`- return FileFormat.load(stream, imageLoader, fileZoom, targetZoom);`
`26`		`- }`
`27`		`-`
`28`	`24`	`static List<ElementAtZoom<ImageData>> load(InputStream stream, ImageLoader imageLoader, int fileZoom, int targetZoom, int flag) {`
`29`	`25`	`return FileFormat.load(stream, imageLoader, fileZoom, targetZoom, flag);`
`30`	`26`	`}`