Skip to content

[Win32] Combine duplicate initialization logic for image from providers #1886

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 8, 2025
Merged

[Win32] Combine duplicate initialization logic for image from providers #1886

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
39 changes: 14 additions & 25 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 @@ -555,16 +555,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
super(device);
this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom (imageFileNameProvider, getZoom());
if (fileName.zoom() == getZoom()) {
ImageHandle imageMetadata = initNative (fileName.element(), getZoom());
if (imageMetadata == null) {
init(new ImageData (fileName.element()), getZoom());
}
} else {
ImageData resizedData = DPIUtil.autoScaleImageData (device, new ImageData (fileName.element()), fileName.zoom());
init(resizedData, getZoom());
}
imageProvider.getImageMetadata(getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -602,9 +593,7 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
super(device);
this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
ElementAtZoom<ImageData> data = DPIUtil.validateAndGetImageDataAtZoom(imageDataProvider, getZoom());
ImageData resizedData = DPIUtil.scaleImageData(device, data.element(), getZoom(), data.zoom());
init (resizedData, getZoom());
imageProvider.getImageMetadata(getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -2146,17 +2135,18 @@ ImageData getImageData(int zoom) {

@Override
ImageHandle getImageMetadata(int zoom) {
ElementAtZoom<String> imageCandidate = DPIUtil.validateAndGetImagePathAtZoom (provider, zoom);
ImageData imageData = new ImageData (imageCandidate.element());
if (imageCandidate.zoom() == zoom) {
/* Release current native resources */
ImageHandle imageMetadata = initNative(imageCandidate.element(), zoom);
if (imageMetadata == null) init(imageData, zoom);
init();
} else {
ImageData resizedData = DPIUtil.scaleImageData(device, imageData, zoom, imageCandidate.zoom());
ImageData newData = adaptImageDataIfDisabledOrGray(resizedData);
init(newData, zoom);
ElementAtZoom<String> fileForZoom = DPIUtil.validateAndGetImagePathAtZoom (provider, zoom);
ImageHandle nativeInitializedImage = null;
if (fileForZoom.zoom() == zoom) {
nativeInitializedImage = initNative(fileForZoom.element(), zoom);
}
if (nativeInitializedImage == null) {
ImageData imageData = new ImageData (fileForZoom.element());
if (fileForZoom.zoom() != zoom) {
imageData = DPIUtil.scaleImageData(device, imageData, zoom, fileForZoom.zoom());
}
imageData = adaptImageDataIfDisabledOrGray(imageData);
init(imageData, zoom);
}
return zoomLevelToImageHandle.get(zoom);
}
Expand Down Expand Up @@ -2213,7 +2203,6 @@ ImageHandle getImageMetadata(int zoom) {
ImageData resizedData = DPIUtil.scaleImageData (device, imageCandidate.element(), zoom, imageCandidate.zoom());
ImageData newData = adaptImageDataIfDisabledOrGray(resizedData);
init(newData, zoom);
init();
return zoomLevelToImageHandle.get(zoom);
}

Expand Down
Loading