fix(jpeg2000): enable ICC profile write - #5419
Open
luna-y-kim wants to merge 1 commit into
Open
Conversation
ICC profile writing was disabled in AcademySoftwareFoundation#1452 due to assertion failures. That was fixed on the OpenJPEG side in v2.5.4 (uclouvain/openjpeg#1574), which is also our current build default. The ICC profile write code is compiled only when building against OpenJPEG >= 2.5.4. The double-free problem in `Jpeg2000Output::close()` is addressed by clearing the `icc_profile_buf` pointer (which points at memory owned by `m_icc_profile`) before `opj_image_destroy()` frees it. Also add a testsuite case. Now the testsuite has two reference outputs: `out.txt` (no ICC, older OpenJPEG) and `out-icc.txt` (with ICC). Since `runtest.py::checkref()` accepts either as alternatives, the text comparison alone cannot catch a breakage. Thus, the extracted .icc file is additionally compared only on OpenJPEG >= 2.5.4, as the real guard. Fixes AcademySoftwareFoundation#4608 Signed-off-by: Luna Kim <177369799+luna-y-kim@users.noreply.github.com>
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
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.
ICC profile writing was disabled in #1452 due to assertion failures. That was fixed on the OpenJPEG side in v2.5.4 (uclouvain/openjpeg#1574), which is also our current build default.
The ICC profile write code is compiled only when building against OpenJPEG >= 2.5.4. The double-free problem in
Jpeg2000Output::close()is addressed by clearing theicc_profile_bufpointer (which points at memory owned bym_icc_profile) beforeopj_image_destroy()frees it.Also add a testsuite case. Now the testsuite has two reference outputs:
out.txt(no ICC, older OpenJPEG) andout-icc.txt(with ICC). Sinceruntest.py::checkref()accepts either as alternatives, the text comparison alone cannot catch a breakage. Thus, the extracted .icc file is additionally compared only on OpenJPEG >= 2.5.4, as the real guard.Fixes #4608
Checklist:
and if I used AI coding assistants, I have an
Assisted-by: TOOL / MODELline in the pull request description above.
behavior.
PR, by pushing the changes to my fork and seeing that the automated CI
passed there. (Exceptions: If most tests pass and you can't figure out why
the remaining ones fail, it's ok to submit the PR and ask for help. Or if
any failures seem entirely unrelated to your change; sometimes things break
on the GitHub runners.)
fixed any problems reported by the clang-format CI test.
corresponding Python bindings. If altering ImageBufAlgo functions, I also
exposed the new functionality as oiiotool options.