Skip to content

[Win32] Initialize copied image provider wrapper on correct image #2188 #2190

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
May 28, 2025
Merged

[Win32] Initialize copied image provider wrapper on correct image #2188 #2190

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
2 changes: 1 addition & 1 deletion 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 @@ -2084,7 +2084,7 @@ protected Rectangle getBounds(int zoom) {

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

Expand Down
18 changes: 18 additions & 0 deletions ...wt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
Expand Down Expand Up @@ -437,6 +438,23 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageGcDrawer() {
image.dispose();
}

@Test
public void test_ConstructorLorg_eclipse_swt_graphics_DeviceImageI() throws IOException {
byte[] bytes = Files.readAllBytes(Path.of(getPath("collapseall.png")));
Image sourceImage = new Image(display, new ByteArrayInputStream(bytes));
Image copiedImage = new Image(display, sourceImage, SWT.IMAGE_COPY);
Image targetImage = new Image(display, 1, 1);
GC gc = new GC(targetImage);
gc.drawImage(sourceImage, 0, 0);
gc.drawImage(targetImage, 0, 0);

assertEquals(0, imageDataComparator().compare(sourceImage.getImageData(), copiedImage.getImageData()));

sourceImage.dispose();
copiedImage.dispose();
targetImage.dispose();
}

@Test
public void test_equalsLjava_lang_Object() {
Image image = null;
Expand Down
Loading