Skip to content

A strict check 200% image data is double the size of 100% image data #2249

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −16
Open

A strict check 200% image data is double the size of 100% image data #2249

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
5 changes: 3 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,10 @@ private static ImageData autoScaleImageData (Device device, final ImageData imag
int height = imageData.height;
int scaledWidth = Math.round (width * scaleFactor);
int scaledHeight = Math.round (height * scaleFactor);
int defaultZoomLevel = 100;
boolean useSmoothScaling = isSmoothScalingEnabled() && imageData.getTransparencyType() != SWT.TRANSPARENCY_MASK;
if (useSmoothScaling) {
Image original = new Image (device, (ImageDataProvider) zoom -> imageData);
Image original = new Image(device, (ImageDataProvider) zoom -> (zoom == defaultZoomLevel) ? imageData : null);
ImageGcDrawer drawer = new ImageGcDrawer() {
@Override
public void drawOn(GC gc, int imageWidth, int imageHeight) {
Expand All @@ -306,7 +307,7 @@ public int getGcStyle() {
}
};
Image resultImage = new Image (device, drawer, scaledWidth, scaledHeight);
ImageData result = resultImage.getImageData (100);
ImageData result = resultImage.getImageData (defaultZoomLevel);
original.dispose ();
resultImage.dispose ();
return result;
Expand Down
19 changes: 19 additions & 0 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 @@ -610,10 +610,29 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
": ImageDataProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
}
if (Device.strictChecks) {
validateLinearScaling(imageDataProvider);
}
init();
this.device.registerResourceWithZoomSupport(this);
}

private void validateLinearScaling(ImageDataProvider provider) {
final int baseZoom = 100;
final int scaledZoom = 200;
final int scaleFactor = scaledZoom / baseZoom;
ImageData baseImageData = provider.getImageData(baseZoom);
ImageData scaledImageData = provider.getImageData(scaledZoom);

if (scaledImageData == null) {
return;
}

if (scaledImageData.width != scaleFactor * baseImageData.width || scaledImageData.height != scaleFactor * baseImageData.height) {
System.err.println("ImageData should be linearly scaled across zooms.");
}
}

/**
* The provided ImageGcDrawer will be called on demand whenever a new variant of the
* Image for an additional zoom is required. Depending on the OS-specific implementation
Expand Down
14 changes: 8 additions & 6 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 @@ -1043,13 +1043,15 @@ public void test_imageDataIsCached() {
public void test_imageDataSameViaDifferentProviders() {
assumeFalse("Cocoa generates inconsistent image data", SwtTestUtil.isCocoa);
String imagePath = getPath("collapseall.png");
ImageFileNameProvider imageFileNameProvider = __ -> {
return imagePath;
ImageFileNameProvider imageFileNameProvider = zoom -> {
return (zoom == 100) ? imagePath : null;
};
ImageDataProvider dataProvider = __ -> {
try (InputStream imageStream = Files.newInputStream(Path.of(imagePath))) {
return new ImageData(imageStream);
} catch (IOException e) {
ImageDataProvider dataProvider = zoom -> {
if (zoom == 100) {
try (InputStream imageStream = Files.newInputStream(Path.of(imagePath))) {
return new ImageData(imageStream);
} catch (IOException e) {
}
}
return null;
};
Expand Down
10 changes: 2 additions & 8 deletions .../JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,11 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvid

@Test
public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageDataProvider() {
ImageDataProvider validImageDataProvider = zoom -> {
String fileName = "collapseall.svg";
return new ImageData(getPath(fileName));
};
ImageDataProvider validImageDataProvider = zoom -> (zoom == 100) ? new ImageData(getPath("collapseall.svg")) : null;
Image image = new Image(Display.getDefault(), validImageDataProvider);
image.dispose();

ImageDataProvider corruptImageDataProvider = zoom -> {
String fileName = "corrupt.svg";
return new ImageData(getPath(fileName));
};
ImageDataProvider corruptImageDataProvider = zoom -> (zoom == 100) ? new ImageData(getPath("corrupt.svg")) : null;
SWTException e = assertThrows(SWTException.class,
() -> new Image(Display.getDefault(), corruptImageDataProvider));
assertSWTProblem("Incorrect exception thrown for provider with corrupt images", SWT.ERROR_INVALID_IMAGE, e);
Expand Down
Loading