Skip to content

Create handles for ImageDataProvider and ImageFilenameProvider on demand #1898

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
Mar 18, 2025
Merged

Create handles for ImageDataProvider and ImageFilenameProvider on demand #1898

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
132 changes: 59 additions & 73 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 @@ -90,6 +90,11 @@ public final class Image extends Resource implements Drawable {
*/
public int type;

/**
* this field make sure the image is initialized without any errors
*/
boolean isInitialized = false;

/**
* specifies the transparent pixel
*/
Expand Down Expand Up @@ -552,7 +557,10 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
super(device);
this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
imageProvider.getImageMetadata(getZoom());
if (imageProvider.getImageData(100) == null) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
": ImageFileNameProvider [" + imageFileNameProvider + "] returns null ImageData at 100% zoom.");
}
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -590,7 +598,10 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
super(device);
this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
imageProvider.getImageMetadata(getZoom());
if (imageDataProvider.getImageData(100) == null) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
": ImageDataProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
}
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -642,6 +653,12 @@ private ImageData adaptImageDataIfDisabledOrGray(ImageData data) {
return returnImageData;
}

@Override
void init() {
super.init();
this.isInitialized = true;
}

private ImageData applyDisableImageData(ImageData data, int height, int width) {
PaletteData palette = data.palette;
RGB[] rgbs = new RGB[3];
Expand Down Expand Up @@ -1891,18 +1908,23 @@ public static Image win32_new(Device device, int type, long handle, int nativeZo
}

private abstract class AbstractImageProviderWrapper {
private boolean isDestroyed;

protected abstract Rectangle getBounds(int zoom);
abstract ImageData getImageData(int zoom);
abstract ImageHandle getImageMetadata(int zoom);
abstract AbstractImageProviderWrapper createCopy(Image image);
abstract boolean isDisposed();

protected boolean isDisposed() {
return !isInitialized || isDestroyed;
}

protected void destroy() {
this.isDestroyed = true;
}
}

private class PlainImageProviderWrapper extends AbstractImageProviderWrapper {
private boolean isDestroyed;
private final int width;
private final int height;

Expand Down Expand Up @@ -1984,16 +2006,6 @@ private long initBaseHandle(int zoom) {
AbstractImageProviderWrapper createCopy(Image image) {
return image.new PlainImageProviderWrapper(width, height);
}

@Override
protected void destroy() {
this.isDestroyed = true;
}

@Override
boolean isDisposed() {
return isDestroyed;
}
}

private abstract class DynamicImageProviderWrapper extends AbstractImageProviderWrapper {
Expand All @@ -2016,28 +2028,43 @@ public boolean equals(Object otherProvider) {
}
}

private class ImageFileNameProviderWrapper extends DynamicImageProviderWrapper {
private abstract class BaseImageProviderWrapper<T> extends DynamicImageProviderWrapper {
protected final T provider;
private final Map<Integer, Rectangle> zoomToBounds = new HashMap<>();

/**
* ImageFileNameProvider to provide file names at various Zoom levels
*/
private final ImageFileNameProvider provider;

ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
checkProvider(provider, ImageFileNameProvider.class);
BaseImageProviderWrapper(T provider, Class<T> expectedClass) {
checkProvider(provider, expectedClass);
this.provider = provider;
}

@Override
Object getProvider() {
return provider;
}

@Override
protected Rectangle getBounds(int zoom) {
ImageHandle imageHandle = zoomLevelToImageHandle.values().iterator().next();
Rectangle rectangle = new Rectangle(0, 0, imageHandle.width, imageHandle.height);
return DPIUtil.scaleBounds(rectangle, zoom, imageHandle.zoom);
if (zoomLevelToImageHandle.containsKey(zoom)) {
ImageHandle imgHandle = zoomLevelToImageHandle.get(zoom);
return new Rectangle(0, 0, imgHandle.width, imgHandle.height);
}
if (!zoomToBounds.containsKey(zoom)) {
ImageData imageData = getImageData(zoom);
Rectangle rectangle = new Rectangle(0, 0, imageData.width, imageData.height);
zoomToBounds.put(zoom, rectangle);
}
return zoomToBounds.get(zoom);
}
}

private class ImageFileNameProviderWrapper extends BaseImageProviderWrapper<ImageFileNameProvider> {
ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
super(provider, ImageFileNameProvider.class);
}

@Override
ImageData getImageData(int zoom) {
ElementAtZoom<String> fileForZoom = DPIUtil.validateAndGetImagePathAtZoom (provider, zoom);
ElementAtZoom<String> fileForZoom = DPIUtil.validateAndGetImagePathAtZoom(provider, zoom);
ImageHandle nativeInitializedImage;
if (zoomLevelToImageHandle.containsKey(fileForZoom.zoom())) {
nativeInitializedImage = zoomLevelToImageHandle.get(fileForZoom.zoom());
Expand Down Expand Up @@ -2072,16 +2099,6 @@ ImageHandle getImageMetadata(int zoom) {
return zoomLevelToImageHandle.get(zoom);
}

@Override
boolean isDisposed() {
return zoomLevelToImageHandle.isEmpty();
}

@Override
Object getProvider() {
return provider;
}

@Override
public int hashCode() {
return Objects.hash(provider, styleFlag, transparentPixel, getZoom());
Expand Down Expand Up @@ -2286,23 +2303,9 @@ private long extractHandleForPixelFormat(int width, int height, int pixelFormat)
}
}

private class ImageDataProviderWrapper extends DynamicImageProviderWrapper {

/**
* ImageDataProvider to provide ImageData at various Zoom levels
*/
private final ImageDataProvider provider;

private class ImageDataProviderWrapper extends BaseImageProviderWrapper<ImageDataProvider> {
ImageDataProviderWrapper(ImageDataProvider provider) {
checkProvider(provider, ImageDataProvider.class);
this.provider = provider;
}

@Override
protected Rectangle getBounds(int zoom) {
ImageHandle imageHandle = zoomLevelToImageHandle.values().iterator().next();
Rectangle rectangle = new Rectangle(0, 0, imageHandle.width, imageHandle.height);
return DPIUtil.scaleBounds(rectangle, zoom, imageHandle.zoom);
super(provider, ImageDataProvider.class);
}

@Override
Expand All @@ -2320,16 +2323,6 @@ ImageHandle getImageMetadata(int zoom) {
return zoomLevelToImageHandle.get(zoom);
}

@Override
boolean isDisposed() {
return zoomLevelToImageHandle.isEmpty();
}

@Override
Object getProvider() {
return provider;
}

@Override
ImageDataProviderWrapper createCopy(Image image) {
return image.new ImageDataProviderWrapper(provider);
Expand All @@ -2340,7 +2333,6 @@ private class ImageGcDrawerWrapper extends DynamicImageProviderWrapper {
private ImageGcDrawer drawer;
private int width;
private int height;
private boolean isDestroyed;

ImageGcDrawerWrapper(ImageGcDrawer imageGcDrawer, int width, int height) {
checkProvider(imageGcDrawer, ImageGcDrawer.class);
Expand Down Expand Up @@ -2379,16 +2371,6 @@ ImageHandle getImageMetadata(int zoom) {
return zoomLevelToImageHandle.get(zoom);
}

@Override
protected void destroy() {
isDestroyed = true;
}

@Override
boolean isDisposed() {
return isDestroyed;
}

@Override
Object getProvider() {
return drawer;
Expand Down Expand Up @@ -2726,5 +2708,9 @@ private ImageData getImageData() {
}
}

private boolean isDisposed() {
return this.handle == 0;
}

}
}
Loading