Added rounding when converting P and PA #5824
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
radarhere
commented
Nov 9, 2021
| @@ -93,7 +93,7 @@ def test_trns_p(tmp_path): | |||
| f = str(tmp_path / "temp.png") | |||
|
|
|||
| im_l = im.convert("L") | |||
| assert im_l.info["transparency"] == 0 # undone | |||
| assert im_l.info["transparency"] == 1 # undone | |||
There was a problem hiding this comment.
The first palette entry is (0, 1, 2). (0*299 + 1*587 + 2*114) / 1000 = 0.815, so this is now rounded to 1.
radarhere
changed the title
homm
reviewed
Nov 9, 2021
src/libImaging/Convert.c
Outdated
| @@ -1013,7 +1013,7 @@ p2l(UINT8 *out, const UINT8 *in, int xsize, const UINT8 *palette) { | |||
| int x; | |||
| /* FIXME: precalculate greyscale palette? */ | |||
| for (x = 0; x < xsize; x++) { | |||
| *out++ = L(&palette[in[x] * 4]) / 1000; | |||
| *out++ = round(L(&palette[in[x] * 4]) / 1000.0); | |||
There was a problem hiding this comment.
Floating point arithmetic slower than integer. It's better to use L24 macro here, it already contains rounding.
There was a problem hiding this comment.
Thanks. I've updated the commit.
radarhere
changed the title
radarhere
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #5728
The issue discusses a pixel in an image with the palette value
(177, 175, 175), and asks why converting from P to L doesn't convert it to 176. That conversion uses the L macro -Pillow/src/libImaging/Convert.c
Lines 1012 to 1016 in a3d1e2f
Pillow/src/libImaging/Convert.c
Line 43 in a3d1e2f
Applying the L macro,
(177*299 + 175*587 + 175*114) / 1000= 175.598Except the
p2lcode above rounds it down. This PR applies proper rounding to bring it to 176.