Sharp rendering of SVGs passed as InputStream #2935

ShahzaibIbrahim · 2026-01-07T11:03:30Z

Wrapping the input stream handling in an ImageDataProvider. In case stream data belong to a dynamically sizable image we create a provider with ImageDataAtSizeProvider else we use ImageDataProvider.

The ImageDataAtSizeProvider will store the stream data and return accordingly loaded image data in its getImageData(width, height) and getImageData(zoom) methods.
The ImageDataProvider will only return according image data at 100% and none for the other zoom, so it does not need to store the stream data.

Contributes to: #2917

How to Test

Run the Snippet390 on Windows, Mac and Linux and compare the results
Currently, In GTK and Cocoa, an image based on an SVG passed as inputStream to Image(Device, InputStream) was blurry. With the current change it should look as good as ImageFileNameProvider as shown in snippet.

Results

Without this PR:

After Changes:

GTK:

Cocoa:

Requires: [MacOS] Correct faulty representation creation on image copy #2954

github-actions · 2026-01-07T11:18:54Z

Test Results

176 files ±0 176 suites ±0 28m 59s ⏱️ + 2m 36s
4 676 tests ±0 4 654 ✅ ±0 22 💤 ±0 0 ❌ ±0
482 runs ±0 476 ✅ ±0 6 💤 ±0 0 ❌ ±0

Results for commit 4df8b13. ± Comparison against base commit 9a91cae.

♻️ This comment has been updated with latest results.

laeubi · 2026-01-07T11:24:45Z

@ShahzaibIbrahim please provide a consistent PR description and at best show before/after screenshot.
Also commit descriptions seem not sufficient.

ShahzaibIbrahim · 2026-01-07T12:10:10Z

@ShahzaibIbrahim please provide a consistent PR description and at best show before/after screenshot. Also commit descriptions seem not sufficient.

Hi @laeubi, This PR is not ready and hence it's currently drafted.

laeubi · 2026-01-07T12:22:59Z

@ShahzaibIbrahim please provide a consistent PR description and at best show before/after screenshot. Also commit descriptions seem not sufficient.

Hi @laeubi, This PR is not ready and hence it's currently drafted.

I appreciate that it's marked as a draft, but even draft PRs should contain a clear title and meaningful description explaining what you're working on and what the expected outcome is. This helps maintainers understand the context and provide better guidance early in the process.

The SWT repository should have draft PRs that clearly communicate:

What issue or improvement you're addressing
What approach you're taking
What the current state is and what still needs to be done

If you need to run CI checks while developing, you can do that on your fork as well. Please update the PR description before continuing, so we can provide better feedback. Thanks!

ShahzaibIbrahim · 2026-01-07T12:37:13Z

I appreciate that it's marked as a draft, but even draft PRs should contain a clear title and meaningful description explaining what you're working on and what the expected outcome is. This helps maintainers understand the context and provide better guidance early in the process.

The SWT repository should have draft PRs that clearly communicate:

What issue or improvement you're addressing

What approach you're taking

What the current state is and what still needs to be done

I have updated the PR description with all the sufficient information I currently have.

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java

Phillipus · 2026-01-07T14:17:15Z

Some early feedback on Mac for this one...

Here's a screenshot running this Snippet of the changes in this PR and #2924

@ShahzaibIbrahim Thank-you for your work on this and #2924

ShahzaibIbrahim · 2026-01-09T12:53:07Z

@HeikoKlare I think tests are fixed. Can you please test my snippet on multiple zoom level on mac to mark this PR ready for review?

Phillipus · 2026-01-09T17:10:45Z

Mac with latest changes:

HeikoKlare

Following up on the comment of @laeubi, wouldn't it be cleaner to wrap the input stream handling in an ImageDataProvider to not further mess up the Image implementation with mutual exclusive providers?
It might work as follows (starting from the InputStream constructor):

Read stream data from stream
Check if stream data belong to a dynamically sizable image, in that case create an ImageDataAtSizeProvider otherwise create an ImageDataProvider.
- The ImageDataAtSizeProvider will store the stream data and return accordingly loaded image data in its getImageData(width, height) and getImageData(zoom) methods
- The ImageDataProvider will only return according image data at 100% and none for the other zoom, so it does not need to store the stream data

Nothing needs to be changed for the loadImageDataAtExactSize then, as it reuses the ImageDataAtSizeProvider functionality.

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java

examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SVGImageTests.java

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java

github-actions · 2026-01-12T14:02:52Z

Test Results (linux)

88 files ±0 88 suites ±0 14m 18s ⏱️ -15s
4 562 tests ±0 4 342 ✅ ±0 220 💤 ±0 0 ❌ ±0
211 runs ±0 208 ✅ ±0 3 💤 ±0 0 ❌ ±0

Results for commit 8e281f9. ± Comparison against base commit 8afb3c5.

♻️ This comment has been updated with latest results.

github-actions · 2026-01-12T14:02:52Z

Test Results (macos)

54 files ±0 54 suites ±0 6m 18s ⏱️ - 1m 14s
4 518 tests ±0 4 275 ✅ ±0 243 💤 ±0 0 ❌ ±0
104 runs ±0 104 ✅ ±0 0 💤 ±0 0 ❌ ±0

Results for commit 8e281f9. ± Comparison against base commit 8afb3c5.

♻️ This comment has been updated with latest results.

ShahzaibIbrahim · 2026-01-12T15:21:27Z

Following up on the comment of @laeubi, wouldn't it be cleaner to wrap the input stream handling in an ImageDataProvider to not further mess up the Image implementation with mutual exclusive providers? It might work as follows (starting from the InputStream constructor):

Read stream data from stream

Check if stream data belong to a dynamically sizable image, in that case create an ImageDataAtSizeProvider otherwise create an ImageDataProvider.

The ImageDataAtSizeProvider will store the stream data and return accordingly loaded image data in its getImageData(width, height) and getImageData(zoom) methods

The ImageDataProvider will only return according image data at 100% and none for the other zoom, so it does not need to store the stream data

Nothing needs to be changed for the loadImageDataAtExactSize then, as it reuses the ImageDataAtSizeProvider functionality.

I have adapted the changes as per your recommendation. It looks good in GTK but some tests are failing in cocoa but I can't figure why. Can you please test for me in mac? @HeikoKlare

HeikoKlare

I have adapted the changes as per your recommendation. It looks good in GTK but some tests are failing in cocoa but I can't figure why. Can you please test for me in mac?

This change uncovered a bug in the image copy implementation for MacOS. I have created a PR to fix it:

#2954

When rebasing your PR on top of that fix, the tests should succeed. Meanwhile, I left some comments for further improvement of the PR.

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java

HeikoKlare

I tested on MacOS again and it works like expected. Code is also fine now.

Wrapping the input stream handling in an ImageDataProvider. In case stream data belong to a dynamically sizable image we create a provider with ImageDataAtSizeProvider else we use ImageDataProvider. - The ImageDataAtSizeProvider will store the stream data and return accordingly loaded image data in its getImageData(width, height) and getImageData(zoom) methods. - The ImageDataProvider will only return according image data at 100% and none for the other zoom, so it does not need to store the stream data. Contributes to: eclipse-platform#2917

ptziegler · 2026-01-26T18:31:26Z

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java

+private static ImageDataProvider createImageDataProvider(InputStream stream) throws IOException {
+	byte[] streamData = stream.readAllBytes();
+	if (ImageDataLoader.isDynamicallySizable(new ByteArrayInputStream(streamData))) {
+		ImageDataAtSizeProvider imageDataAtSizeProvider = (width, height) -> ImageDataLoader


This doesn't work when loading the ImageData of an Image by zoom. Because the getDefaultSize() method is not overridden, a 1x1 ImageData is returned at 100% zoom, otherwise null.

eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataAtSizeProvider.java

Lines 46 to 55 in c6ec34e

default ImageData getImageData(int zoom) {

Point defaultSize = getDefaultSize();

if (new Point(-1, -1).equals(defaultSize)) {

if (zoom == 100) {

return new ImageData(1, 1, 32, new PaletteData(0xFF0000, 0xFF00, 0xFF));

}

return null;

}

return getImageData(DPIUtil.pointToPixel(defaultSize.x, zoom), DPIUtil.pointToPixel(defaultSize.y, zoom));

}

Damn, I even though about that case when reviewing the PR and somehow didn't follow-up on it. Too bad that there was not even a test for it. Thank you for fixing that with #3012!

ShahzaibIbrahim force-pushed the master-567 branch from 9d99069 to 3f0b54c Compare January 7, 2026 12:24

ShahzaibIbrahim linked an issue Jan 7, 2026 that may be closed by this pull request

Sharp rendering of SVGs passed as InputStream to Image constructor when drawing at arbitrary size vi-eclipse/Eclipse-Platform#567

Closed

ShahzaibIbrahim changed the title ~~SVG Sharp Renderring~~ Sharp rendering of SVGs passed as InputStream Jan 7, 2026

laeubi reviewed Jan 7, 2026

View reviewed changes

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java Outdated Show resolved Hide resolved

ShahzaibIbrahim force-pushed the master-567 branch 2 times, most recently from 25abe2b to e4cd2a2 Compare January 8, 2026 12:55

ShahzaibIbrahim force-pushed the master-567 branch from e4cd2a2 to 4cdd05f Compare January 9, 2026 12:53

HeikoKlare reviewed Jan 10, 2026

View reviewed changes

Copilot AI mentioned this pull request Jan 12, 2026

Add draft PR guidelines to CONTRIBUTING.md laeubi/.github-eclipse-platform#1

Merged

laeubi mentioned this pull request Jan 12, 2026

Add draft PR guidelines to CONTRIBUTING.md eclipse-platform/.github#260

Merged

ShahzaibIbrahim force-pushed the master-567 branch 3 times, most recently from d8ac328 to df2bf7a Compare January 12, 2026 13:47

HeikoKlare reviewed Jan 12, 2026

View reviewed changes

ShahzaibIbrahim force-pushed the master-567 branch 3 times, most recently from b3701bb to f7b36dc Compare January 13, 2026 12:01

ShahzaibIbrahim marked this pull request as ready for review January 13, 2026 12:02

HeikoKlare reviewed Jan 13, 2026

View reviewed changes

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java Outdated Show resolved Hide resolved

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java Outdated Show resolved Hide resolved

ShahzaibIbrahim force-pushed the master-567 branch 4 times, most recently from e095d5c to c71c599 Compare January 13, 2026 16:09

HeikoKlare force-pushed the master-567 branch from c71c599 to 58a7a2a Compare January 14, 2026 08:23

HeikoKlare approved these changes Jan 14, 2026

View reviewed changes

HeikoKlare force-pushed the master-567 branch from 58a7a2a to 8aaf426 Compare January 14, 2026 12:40

HeikoKlare force-pushed the master-567 branch from 8aaf426 to 8e281f9 Compare January 14, 2026 16:06

HeikoKlare merged commit 6d69470 into eclipse-platform:master Jan 14, 2026
28 of 29 checks passed

HeikoKlare deleted the master-567 branch January 14, 2026 16:45

This was referenced Jan 26, 2026

ImageData reports wrong size for Image created from SVG InputStream #3011

Closed

Drawing of SVGs is broken again eclipse-gef/gef-classic#988

Open

ptziegler reviewed Jan 26, 2026

View reviewed changes

	default ImageData getImageData(int zoom) {
	Point defaultSize = getDefaultSize();
	if (new Point(-1, -1).equals(defaultSize)) {
	if (zoom == 100) {
	return new ImageData(1, 1, 32, new PaletteData(0xFF0000, 0xFF00, 0xFF));
	}
	return null;
	}
	return getImageData(DPIUtil.pointToPixel(defaultSize.x, zoom), DPIUtil.pointToPixel(defaultSize.y, zoom));
	}

Sharp rendering of SVGs passed as InputStream #2935

Sharp rendering of SVGs passed as InputStream #2935

Uh oh!

Conversation

ShahzaibIbrahim commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to Test

Results

Uh oh!

github-actions bot commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

laeubi commented Jan 7, 2026

Uh oh!

ShahzaibIbrahim commented Jan 7, 2026

Uh oh!

laeubi commented Jan 7, 2026

Uh oh!

ShahzaibIbrahim commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Phillipus commented Jan 7, 2026

Uh oh!

ShahzaibIbrahim commented Jan 9, 2026

Uh oh!

Phillipus commented Jan 9, 2026

Uh oh!

HeikoKlare left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results (linux)

Uh oh!

github-actions bot commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results (macos)

Uh oh!

ShahzaibIbrahim commented Jan 12, 2026

Uh oh!

HeikoKlare left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HeikoKlare left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ptziegler Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HeikoKlare Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

ShahzaibIbrahim commented Jan 7, 2026 •

edited

Loading

github-actions bot commented Jan 7, 2026 •

edited

Loading

ShahzaibIbrahim commented Jan 7, 2026 •

edited

Loading

github-actions bot commented Jan 12, 2026 •

edited

Loading

github-actions bot commented Jan 12, 2026 •

edited

Loading

ptziegler Jan 26, 2026 •

edited

Loading

HeikoKlare Jan 26, 2026 •

edited

Loading