Allow tuples with one item to give single color value in getink #4927
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
nulano
reviewed
Sep 21, 2020
Co-authored-by: nulano <nulano@nulano.eu>
nulano
approved these changes
Sep 22, 2020
| @@ -330,21 +330,22 @@ def test_p_putpixel_rgb_rgba(self): | |||
| class TestImagePutPixelError(AccessTest): | |||
| IMAGE_MODES1 = ["L", "LA", "RGB", "RGBA"] | |||
| IMAGE_MODES2 = ["I", "I;16", "BGR;15"] | |||
| INVALID_TYPES1 = ["foo", 1.0, None] | |||
| INVALID_TYPES2 = [*INVALID_TYPES1, (10,)] | |||
| INVALID_TYPES = ["foo", 1.0, None] | |||
There was a problem hiding this comment.
Suggested change
| INVALID_TYPES = ["foo", 1.0, None] | |
| INVALID_TYPES = ["foo", 1.0, None, ((10,),)] |
Tuple can be accepted, but probably not tuple-in-tuple. Maybe test for that as well? Or is that too much of an edge-case?
Comment on lines
+521
to
+523
| if (PyTuple_Check(color) && PyTuple_Size(color) == 1) { | ||
| color = PyTuple_GetItem(color, 0); | ||
| } |
There was a problem hiding this comment.
I think this currently makes L mode accept tuple(tuple(10)) and RGB mode accept tuple(tuple(255,255,255)), which is probably not the intended behaviour.
Suggested change
| if (PyTuple_Check(color) && PyTuple_Size(color) == 1) { | |
| color = PyTuple_GetItem(color, 0); | |
| } | |
| /* IMAGING_TYPE_UINT8 unpacks tuples later */ | |
| if (im->type != IMAGING_TYPE_UINT8 && PyTuple_Check(color) && PyTuple_Size(color) == 1) { | |
| color = PyTuple_GetItem(color, 0); | |
| } |
hugovk
approved these changes
Oct 11, 2020
|
My code broke, probably because of this PR: image = PIL.ImageOps.pad(
image,
(max(image.width, min_width), max(image.height, min_height)),
color=(255, 255, 255),
)How do you now provide an RGB tuple? |
|
I don't think this PR should have broken your code. What mode is your image? What error are you receiving? |
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 #4925
Normally, a user would run
Image.new('F', (100,100), 255)andImage.new('I', (100,100), 255), providing a single value forcolorfor those modes.This PR allows users to also provide that single value inside a tuple,
Image.new('F', (200,100), (255,))andImage.new('I', (200,100), (255,)), which would have previously thrown an error.