Skip to content
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

[win32] Create ImageData based image handles on demand #1909

Merged
merged 1 commit into from
Mar 25, 2025
Merged

[win32] Create ImageData based image handles on demand #1909

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
154 changes: 139 additions & 15 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 @@ -371,9 +371,7 @@ public Image(Device device, ImageData data) {
super(device);
if (data == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
int deviceZoom = getZoom();
data = scaleImageData(data, deviceZoom, 100);
init(data, deviceZoom);
this.imageProvider = new PlainImageDataProviderWrapper(data);
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -416,10 +414,7 @@ public Image(Device device, ImageData source, ImageData mask) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
source = scaleImageData(source, getZoom(), 100);
mask = scaleImageData(mask, getZoom(), 100);
mask = ImageData.convertMask(mask);
initIconHandle(this.device, source, mask, getZoom());
this.imageProvider = new MaskedImageDataProviderWrapper(source, mask);
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -479,11 +474,9 @@ public Image(Device device, ImageData source, ImageData mask) {
*/
public Image (Device device, InputStream stream) {
super(device);
if (stream == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
int deviceZoom = getZoom();
ElementAtZoom<ImageData> imageCandidate = ImageDataLoader.load(stream, FileFormat.DEFAULT_ZOOM, deviceZoom);
ImageData data = scaleImageData(imageCandidate.element(), deviceZoom, imageCandidate.zoom());
init(data, deviceZoom);
this.imageProvider = new ImageDataLoaderStreamProviderWrapper(stream);
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -524,10 +517,16 @@ public Image (Device device, String filename) {
super(device);
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);
ImageData data = scaleImageData(imageCandidate.element(), deviceZoom, imageCandidate.zoom());
init(data, deviceZoom);
this.imageProvider = new ImageFileNameProviderWrapper(zoom -> {
if (zoom == 100) {
return filename;
}
return null;
});
if (imageProvider.getImageData(100) == null) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
": [" + filename + "] returns null ImageData at 100% zoom.");
}
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -1947,6 +1946,131 @@ protected void destroy() {
}
}

private abstract class ImageFromImageDataProviderWrapper extends AbstractImageProviderWrapper {

protected abstract ElementAtZoom<ImageData> loadImageData(int zoom);

void initImage() {
// As the init call configured some Image attributes (e.g. type)
// it must be called
ImageData imageDataAt100 = getImageData(100);
init(imageDataAt100, 100);
destroyHandleForZoom(100);
}

@Override
ImageData getImageData(int zoom) {
if (zoomLevelToImageHandle.containsKey(zoom)) {
return zoomLevelToImageHandle.get(zoom).getImageData();
}
if (!zoomLevelToImageHandle.isEmpty()) {
return getScaledImageData(zoom);
}
ElementAtZoom<ImageData> loadedImageData = loadImageData(zoom);
return DPIUtil.scaleImageData(device, loadedImageData, zoom);
}

@Override
ImageHandle getImageMetadata(int zoom) {
if (zoomLevelToImageHandle.containsKey(zoom)) {
return zoomLevelToImageHandle.get(zoom);
} else {
ImageData scaledImageData = getImageData(zoom);
ImageHandle imageHandle = init(scaledImageData, zoom);
return imageHandle;
}
}
}

private class PlainImageDataProviderWrapper extends ImageFromImageDataProviderWrapper {
private ImageData imageDataAt100;

PlainImageDataProviderWrapper(ImageData imageData) {
this.imageDataAt100 = (ImageData) imageData.clone();
initImage();
}

@Override
protected Rectangle getBounds(int zoom) {
Rectangle rectangle = new Rectangle(0, 0, imageDataAt100.width, imageDataAt100.height);
return DPIUtil.scaleUp(rectangle, zoom);
}

@Override
protected ElementAtZoom<ImageData> loadImageData(int zoom) {
return new ElementAtZoom<>(imageDataAt100, 100);
}

@Override
AbstractImageProviderWrapper createCopy(Image image) {
return image.new PlainImageDataProviderWrapper(this.imageDataAt100);
}
}

private class MaskedImageDataProviderWrapper extends ImageFromImageDataProviderWrapper {
private final ImageData srcAt100;
private final ImageData maskAt100;

MaskedImageDataProviderWrapper(ImageData srcAt100, ImageData maskAt100) {
this.srcAt100 = (ImageData) srcAt100.clone();
this.maskAt100 = (ImageData) maskAt100.clone();
initImage();
}

@Override
protected Rectangle getBounds(int zoom) {
Rectangle rectangle = new Rectangle(0, 0, srcAt100.width, srcAt100.height);
return DPIUtil.scaleUp(rectangle, zoom);
}

@Override
protected ElementAtZoom<ImageData> loadImageData(int zoom) {
ImageData scaledSource = DPIUtil.scaleImageData(device, srcAt100, zoom, 100);
ImageData scaledMask = DPIUtil.scaleImageData(device, maskAt100, zoom, 100);
scaledMask = ImageData.convertMask(scaledMask);
ImageData mergedData = applyMask(scaledSource, scaledMask);
return new ElementAtZoom<>(mergedData, zoom);
}

@Override
AbstractImageProviderWrapper createCopy(Image image) {
return image.new MaskedImageDataProviderWrapper(this.srcAt100, this.maskAt100);
}
}

private class ImageDataLoaderStreamProviderWrapper extends ImageFromImageDataProviderWrapper {
private byte[] inputStreamData;

ImageDataLoaderStreamProviderWrapper(InputStream inputStream) {
try {
this.inputStreamData = inputStream.readAllBytes();
initImage();
} catch (IOException e) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, e);
}
}

private ImageDataLoaderStreamProviderWrapper(byte[] inputStreamData) {
this.inputStreamData = inputStreamData;
}

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

@Override
protected Rectangle getBounds(int zoom) {
ImageData scaledImageData = getImageData(zoom);
return new Rectangle(0, 0, scaledImageData.width, scaledImageData.height);
}

@Override
AbstractImageProviderWrapper createCopy(Image image) {
return new ImageDataLoaderStreamProviderWrapper(inputStreamData);
}
}

private class PlainImageProviderWrapper extends AbstractImageProviderWrapper {
private final int width;
private final int height;
Expand Down
Loading