Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated openjpeg to 2.5.2 #7837

Merged
merged 1 commit into from Feb 29, 2024
Merged

Updated openjpeg to 2.5.2 #7837

merged 1 commit into from Feb 29, 2024

Conversation

radarhere
Copy link
Member

@radarhere radarhere commented Feb 26, 2024

openjpeg 2.5.2 has been released - https://github.com/uclouvain/openjpeg/releases/tag/v2.5.2

This reverts the patch from #6718

@moubctez
Copy link

moubctez commented Feb 27, 2024

OpenJPEG 2.5.1 defines OPJ_VERSION_MAJOR, so this

/* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
#ifndef OPJ_VERSION_MAJOR

is no longer valid (in src/libImaging/Jpeg2KEncode.c and src/libImaging/Jpeg2KDecode.c).

@radarhere
Copy link
Member Author

From what I can see, OPJ_VERSION_MAJOR has been around since OpenJPEG 2.1.0 - so I think the comment meant 2.0.x, not 2.x.

So for this segment,

/* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
#ifndef OPJ_VERSION_MAJOR
opj_stream_set_user_data(stream, state);
#else
opj_stream_set_user_data(stream, state, NULL);

the intention is to call the earlier version of opj_stream_set_user_data for earlier OpenJPEG versions.

@radarhere radarhere changed the title Updated openjpeg to 2.5.1 Updated openjpeg to 2.5.2 Feb 28, 2024
@hugovk hugovk merged commit bebf038 into python-pillow:main Feb 29, 2024
84 of 85 checks passed
@radarhere radarhere deleted the openjpeg branch February 29, 2024 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants