Skip to content

Extend ImageLoader to be able to load images at a given height and width #2509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2025
+108 −23
Merged

Extend ImageLoader to be able to load images at a given height and width #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ public Image(Device device, InputStream stream) {
try {
byte[] input = stream.readAllBytes();
initWithSupplier(zoom -> ImageDataLoader.canLoadAtZoom(new ByteArrayInputStream(input), FileFormat.DEFAULT_ZOOM, zoom),
zoom -> ImageDataLoader.load(new ByteArrayInputStream(input), FileFormat.DEFAULT_ZOOM, zoom).element());
zoom -> ImageDataLoader.loadByZoom(new ByteArrayInputStream(input), FileFormat.DEFAULT_ZOOM, zoom).element());
init();
} catch (IOException e) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, e);
Expand Down Expand Up @@ -742,7 +742,7 @@ public Image(Device device, String filename) {
initNative(filename);
if (this.handle == null) {
initWithSupplier(zoom -> ImageDataLoader.canLoadAtZoom(filename, FileFormat.DEFAULT_ZOOM, zoom),
zoom -> ImageDataLoader.load(filename, FileFormat.DEFAULT_ZOOM, zoom).element());
zoom -> ImageDataLoader.loadByZoom(filename, FileFormat.DEFAULT_ZOOM, zoom).element());
}
init();
} finally {
Expand Down Expand Up @@ -789,7 +789,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
initNative(filename);
if (this.handle == null) init(ImageDataLoader.load(filename, 100, 100).element(), 100);
if (this.handle == null) init(ImageDataLoader.loadByZoom(filename, 100, 100).element(), 100);
init();
String filename2x = imageFileNameProvider.getImagePath(200);
if (filename2x != null) {
Expand All @@ -799,7 +799,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
handle.addRepresentation(rep);
} else if (ImageDataLoader.canLoadAtZoom(filename, 100, 200)) {
// Try to natively scale up the image (e.g. possible if it's an SVG)
ImageData imageData2x = ImageDataLoader.load(filename, 100, 200).element();
ImageData imageData2x = ImageDataLoader.loadByZoom(filename, 100, 200).element();
alphaInfo_200 = new AlphaInfo();
NSBitmapImageRep rep = createRepresentation (imageData2x, alphaInfo_200);
handle.addRepresentation(rep);
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/NativeImageLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public static List<ElementAtZoom<ImageData>> load(ElementAtZoom<InputStream> str
return FileFormat.load(streamAtZoom, imageLoader, targetZoom);
}

public static ImageData load(InputStream streamAtZoom, ImageLoader imageLoader, int width, int height) {
return FileFormat.load(streamAtZoom, imageLoader, width, height);
}

public static void save(OutputStream stream, int format, ImageLoader imageLoader) {
FileFormat.save(stream, format, imageLoader);
}
Expand Down
28 changes: 20 additions & 8 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,32 @@ public static boolean canLoadAtZoom(InputStream stream, int fileZoom, int target
return ImageLoader.canLoadAtZoom(stream, fileZoom, targetZoom);
}

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 boolean canLoadAtZoom(String filename, int fileZoom, int targetZoom) {
return ImageLoader.canLoadAtZoom(filename, fileZoom, targetZoom);
}

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> loadByZoom(InputStream stream, int fileZoom, int targetZoom) {
List<ElementAtZoom<ImageData>> data = new ImageLoader().loadByZoom(stream, fileZoom, targetZoom);
if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
return data.get(0);
}

public static ElementAtZoom<ImageData> loadByZoom(String filename, int fileZoom, int targetZoom) {
List<ElementAtZoom<ImageData>> data = new ImageLoader().loadByZoom(filename, fileZoom, targetZoom);
if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
return data.get(0);
}

public static ImageData loadBySize(InputStream stream, int width, int height) {
ImageData data = new ImageLoader().loadBySize(stream, width, height);
if (data == null) SWT.error(SWT.ERROR_INVALID_IMAGE);
return data;
}

public static ImageData loadBySize(String filename, int width, int height) {
ImageData data = new ImageLoader().loadBySize(filename, width, height);
if (data == null) SWT.error(SWT.ERROR_INVALID_IMAGE);
return data;
}

}
28 changes: 23 additions & 5 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,26 @@ void reset() {
* </ul>
*/
public ImageData[] load(InputStream stream) {
load(stream, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM);
loadByZoom(stream, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM);
return data;
}

List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int targetZoom) {
List<ElementAtZoom<ImageData>> loadByZoom(InputStream stream, int fileZoom, int targetZoom) {
if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
reset();
List<ElementAtZoom<ImageData>> images = NativeImageLoader.load(new ElementAtZoom<>(stream, fileZoom), this, targetZoom);
data = images.stream().map(ElementAtZoom::element).toArray(ImageData[]::new);
return images;
}

ImageData loadBySize(InputStream stream, int width, int height) {
if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
reset();
ImageData image = NativeImageLoader.load(stream, this, width, height);
data = new ImageData[] {image};
return image;
}

static boolean canLoadAtZoom(InputStream stream, int fileZoom, int targetZoom) {
if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
return FileFormat.canLoadAtZoom(new ElementAtZoom<>(stream, fileZoom), targetZoom);
Expand All @@ -187,14 +195,24 @@ static boolean canLoadAtZoom(InputStream stream, int fileZoom, int targetZoom) {
* </ul>
*/
public ImageData[] load(String filename) {
load(filename, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM);
loadByZoom(filename, FileFormat.DEFAULT_ZOOM, FileFormat.DEFAULT_ZOOM);
return data;
}

List<ElementAtZoom<ImageData>> load(String filename, int fileZoom, int targetZoom) {
List<ElementAtZoom<ImageData>> loadByZoom(String filename, int fileZoom, int targetZoom) {
if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
try (InputStream stream = new FileInputStream(filename)) {
return loadByZoom(stream, fileZoom, targetZoom);
} catch (IOException e) {
SWT.error(SWT.ERROR_IO, e);
}
return null;
}

ImageData loadBySize(String filename, int width, int height) {
if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
try (InputStream stream = new FileInputStream(filename)) {
return load(stream, fileZoom, targetZoom);
return loadBySize(stream, width, height);
} catch (IOException e) {
SWT.error(SWT.ERROR_IO, e);
}
Expand Down
31 changes: 31 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ static abstract class StaticImageFileFormat extends FileFormat {
List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom) {
return Arrays.stream(loadFromByteStream()).map(d -> new ElementAtZoom<>(d, fileZoom)).toList();
}

@Override
ImageData loadFromByteStreamBySize(int width, int height) {
return loadFromByteStream()[0];
}
}

LEDataInputStream inputStream;
Expand All @@ -104,6 +109,8 @@ List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom)
*/
abstract List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom);

abstract ImageData loadFromByteStreamBySize(int width, int height);

/**
* Read the specified input stream, and return the
* device independent image array represented by the stream.
Expand All @@ -122,6 +129,20 @@ public List<ElementAtZoom<ImageData>> loadFromStream(LEDataInputStream stream, i
}
}

public ImageData loadFromStreamBySize(LEDataInputStream stream, int width, int height) {
try {
inputStream = stream;
return loadFromByteStreamBySize(width, height);
} catch (Exception e) {
if (e instanceof IOException) {
SWT.error(SWT.ERROR_IO, e);
} else {
SWT.error(SWT.ERROR_INVALID_IMAGE, e);
}
return null;
}
}

/**
* Read the specified input stream using the specified loader, and
* return the device independent image array represented by the stream.
Expand All @@ -136,6 +157,16 @@ public static List<ElementAtZoom<ImageData>> load(ElementAtZoom<InputStream> is,
return fileFormat.loadFromStream(stream, is.zoom(), targetZoom);
}

public static ImageData load(InputStream is, ImageLoader loader, int width, int height) {
LEDataInputStream stream = new LEDataInputStream(is);
FileFormat fileFormat = determineFileFormat(stream).orElseGet(() -> {
SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
return null;
});
fileFormat.loader = loader;
return fileFormat.loadFromStreamBySize(stream, width, height);
}

public static boolean canLoadAtZoom(ElementAtZoom<InputStream> is, int targetZoom) {
return is.zoom() == targetZoom || isDynamicallySizableFormat(is.element());
}
Expand Down
12 changes: 12 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/SVGFileFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ List<ElementAtZoom<ImageData>> loadFromByteStream(int fileZoom, int targetZoom)
return List.of(new ElementAtZoom<>(rasterizedImageData, targetZoom));
}

@Override
ImageData loadFromByteStreamBySize(int width, int height) {
if (RASTERIZER == null) {
SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT, null, " [No SVG rasterizer found]");
}
if (width <= 0 || height <= 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, null, " [Cannot rasterize SVG for width or height <= 0]");
}
ImageData rasterizedImageData = RASTERIZER.rasterizeSVG(inputStream, width, height);
return rasterizedImageData;
}

@Override
void unloadIntoByteStream(ImageLoader loader) {
throw new UnsupportedOperationException();
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ public Image(Device device, ImageData source, ImageData mask) {
public Image(Device device, InputStream stream) {
super(device);
currentDeviceZoom = DPIUtil.getDeviceZoom();
ElementAtZoom<ImageData> image = ImageDataLoader.load(stream, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
ElementAtZoom<ImageData> image = ImageDataLoader.loadByZoom(stream, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
ImageData data = DPIUtil.scaleImageData(device, image, currentDeviceZoom);
init(data);
init();
Expand Down Expand Up @@ -594,7 +594,7 @@ public Image(Device device, String filename) {
super(device);
if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
currentDeviceZoom = DPIUtil.getDeviceZoom();
ElementAtZoom<ImageData> image = ImageDataLoader.load(filename, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
ElementAtZoom<ImageData> image = ImageDataLoader.loadByZoom(filename, FileFormat.DEFAULT_ZOOM, currentDeviceZoom);
ImageData data = DPIUtil.scaleImageData(device, image, currentDeviceZoom);
init(data);
init();
Expand Down Expand Up @@ -785,7 +785,7 @@ private void initFromFileNameProvider(int zoom) {
initNative(fileForZoom.element());
}
if (this.surface == 0) {
ElementAtZoom<ImageData> imageDataAtZoom = ImageDataLoader.load(fileForZoom.element(), fileForZoom.zoom(), zoom);
ElementAtZoom<ImageData> imageDataAtZoom = ImageDataLoader.loadByZoom(fileForZoom.element(), fileForZoom.zoom(), zoom);
ImageData imageData = imageDataAtZoom.element();
if (imageDataAtZoom.zoom() != zoom) {
imageData = DPIUtil.scaleImageData(device, imageDataAtZoom, zoom);
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/NativeImageLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ public static List<ElementAtZoom<ImageData>> load(ElementAtZoom<InputStream> str
return Arrays.stream(imgDataArray).map(data -> new ElementAtZoom<>(data, streamAtZoom.zoom())).toList();
}

public static ImageData load(InputStream streamAtZoom, ImageLoader imageLoader, int width, int height) {
return FileFormat.load(streamAtZoom, imageLoader, width, height);
}

/**
* Return true if the image is an interlaced PNG file. This is used to check
* whether ImageLoaderEvent should be fired when loading images.
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ private ImageDataLoaderStreamProviderWrapper(byte[] inputStreamData) {

@Override
protected ElementAtZoom<ImageData> loadImageData(int zoom) {
return ImageDataLoader.load(new ByteArrayInputStream(inputStreamData), FileFormat.DEFAULT_ZOOM, zoom);
return ImageDataLoader.loadByZoom(new ByteArrayInputStream(inputStreamData), FileFormat.DEFAULT_ZOOM, zoom);
}

@Override
Expand Down Expand Up @@ -2349,7 +2349,7 @@ protected ElementAtZoom<ImageData> loadImageData(int zoom) {

// Load at appropriate zoom via loader
if (fileForZoom.zoom() != zoom && ImageDataLoader.canLoadAtZoom(fileForZoom.element(), fileForZoom.zoom(), zoom)) {
ElementAtZoom<ImageData> imageDataAtZoom = ImageDataLoader.load(fileForZoom.element(), fileForZoom.zoom(), zoom);
ElementAtZoom<ImageData> imageDataAtZoom = ImageDataLoader.loadByZoom(fileForZoom.element(), fileForZoom.zoom(), zoom);
return new ElementAtZoom<>(imageDataAtZoom.element(), zoom);
}

Expand All @@ -2362,7 +2362,7 @@ protected ElementAtZoom<ImageData> loadImageData(int zoom) {
}
ElementAtZoom<ImageData> imageDataAtZoom;
if (nativeInitializedImage == null) {
imageDataAtZoom = ImageDataLoader.load(fileForZoom.element(), fileForZoom.zoom(), zoom);
imageDataAtZoom = ImageDataLoader.loadByZoom(fileForZoom.element(), fileForZoom.zoom(), zoom);
} else {
imageDataAtZoom = new ElementAtZoom<>(nativeInitializedImage.getImageData(), fileForZoom.zoom());
nativeInitializedImage.destroy();
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/NativeImageLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public static List<ElementAtZoom<ImageData>> load(ElementAtZoom<InputStream> str
return FileFormat.load(streamAtZoom, imageLoader, targetZoom);
}

public static ImageData load(InputStream streamAtZoom, ImageLoader imageLoader, int width, int height) {
return FileFormat.load(streamAtZoom, imageLoader, width, height);
}

public static void save(OutputStream stream, int format, ImageLoader imageLoader) {
FileFormat.save(stream, format, imageLoader);
}
Expand Down
Loading