When reading BLP, do not trust JPEG decoder to determine image is CMYK #6767
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
|
I tested the patch myself with each Python we deliver pillow for and the test suite is green again. Thanks! Out of curiosity, IIUIC, the fix is to tell libjpeg explicitly that the given image is "CMYK" as it no longer detects it itself (and Pillow does know that through other means)? |
|
Yes, that's correct. |
5 tasks
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 #6741
libjpeg 9e has decided to no longer detect the JPEG embedded within Tests/images/blp/blp1_jpeg.blp as being CMYK.
To allow our tests to still pass, if the BLP JPEG is in CMYK mode, this PR passes a value for
jpegmode, so that JpegDecode.c will override what libjpeg has detected.Testing in libjpeg 9d and 9e in my fork of pillow-wheels, the BLP tests fail without this, and pass with it.