JPEG2000: Support decoding subsampled RGB and YCbCr images #4996
Conversation
This file contains hidden or 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
This was referenced Oct 20, 2020
Member
|
python-pillow/pillow-depends#35 merged, CI restarted. |
|
@nulano I am getting the following compiler warnings with clang (version 12) on Mac OSX: When I try to compile it with clang (version 11) on Linux (Ubuntu 20.04), compilation fails: |
Contributor
Author
|
@hackermd Thank you for testing. All of those warnings are unrelated to this PR and should now be fixed by the merge @radarhere did just above your comment. You didn't provide a log for the Linux Docker build, but I'm guessing it uses |
|
@nulano the build is already based on 2341c6b Here is the relevant part of the docker build log: |
Contributor
Author
|
I don't see an error in that output, I think there might still be something missing. I also don't see why this PR should cause any compile issues, have you tried compiling the master branch? |
I am getting the same issue when trying to compile the master branch. Do I need to configure anything else for using clang to compile PIL on Ubuntu? I am fine with using GCC. |
Contributor
Author
|
Is there anything blocking this? |
Member
|
I don't think so. There are a few uncovered lines, but we'd need to find specific j2k files to hit them. |
Member
|
This does interact with an upcoming security patch. It's a pretty trivial merge fix, but it changes the error from the test cases. |
Member
|
I think I'd prefer to merge this just after the release, so that we don't potentially trip up a security issue. |
radarhere
reviewed
Apr 10, 2021
radarhere
reviewed
Apr 10, 2021
Member
|
I was ok with this before the release, except for the potential conflict with the security patch. Lets get it merged and fix things up if necessary. |
wiredfool
approved these changes
Apr 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Fixes #4991
Fixes #3946
Adds support decoding subsampled RGB and YCbCr JPEG2000 images.
I left the grayscale formats as-is as I was a bit confused by the code and did not find test files for these formats.
Test images are from https://github.com/uclouvain/openjpeg-data, but these are huge and have an unusual license, so they are in python-pillow/pillow-depends#35.
subsampling_1.jp2andzoo1.jp2are YCbCr 4:2:0 andsubsampling_2.jp2andzoo2.jp2are something like RGB 2:2:0 (2x2 subsampling for all 3 channels). This list is based on this OpenJPEG test.Until the pillow-depends PR is merged, see successful test in another branch: https://github.com/nulano/Pillow/runs/1279251514?check_suite_focus=true#step:10:425All four images have
color_space = OPJ_CLRSPC_UNSPECIFIED, and based on uclouvain/openjpeg#570 I think this may be a bug, but I did not look into fixing this.