v3.2.3 commits and release notes #1638
Merged
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
…SoftwareFoundation#1635) exrcheck by default uses file mode, but the fuzzer and exrcheck -s use stream mode, need to respect the memory and time flags consistently on that path as well. Will address OSS-Fuzz 66612, although real fix underlying is in AcademySoftwareFoundation#1634 Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
…wareFoundation#1570) Signed-off-by: ianianda <wyking1030@gmail.com>
* fix typo in README.md change make -> cmake Signed-off-by: Barnaby Robson <brobson@ilm.com> * removes mkdir. Suggested by Milos in review. I tested it and it works. Signed-off-by: Barnaby Robson <brobson@ilm.com> --------- Signed-off-by: Barnaby Robson <brobson@ilm.com>
…tion#1579) The CI platform that builds the wheels is Intel based and by default only builds Intel wheels. Modern Macs are all based on Apple Silicon so to support them we need to also build arm64. This is done via cross compiling. It is not possible to test when cross compiling according to: https://cibuildwheel.readthedocs.io/en/stable/faq/#how-to-cross-compile Signed-off-by: Barnaby Robson <brobson@ilm.com>
…n#1578) forgot a few things Signed-off-by: cdleu430 <cleu@ilm.com>
These are intended to exercise methods that are currently not covered by other tests according to the coverage report. Signed-off-by: Ben Grimes <bgrimes@ilm.com>
…n#1591) There was an issue with the data type not passed to the DCT decompressor in the DWA decoder. That caused 32 bit DWA images to look squashed, as the decompressed 16 bit values were not getting expanded back to 32 bit. Signed-off-by: Anton Dukhovnikov <antond@wetafx.co.nz>
The file version is set to 2 above for writing files (it is impossible write version 1 data). Please refer to the history of history of ImfDwaCompressor.cpp or look at the reading code for details on the version 1 format. Signed-off-by: Dave Sawyer <kingsawyer@gmail.com>
* add deep id/manifest tools and docs Signed-off-by: Peter Hillman <peterh@wetafx.co.nz> * fix const-ness in deepidexample Signed-off-by: Peter Hillman <peterh@wetafx.co.nz> * fix link on doc, better variable name Signed-off-by: Peter Hillman <peterh@wetafx.co.nz> * add discussion of cryptomatte and deep compositing Signed-off-by: Peter Hillman <peterh@wetafx.co.nz> * fix names of cryptomatte ID channels Signed-off-by: Peter Hillman <peterh@wetafx.co.nz> --------- Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
…penEXRFileLayout.rst - 3rd attempt (AcademySoftwareFoundation#1587) * Replaced the sample exr file code blocks with a grid table formatted with bytes of the sample file in one column. The value in the second column and the third column being the description of the bytes and value. Signed-off-by: An Nguyen <annguyen@ilm.com> * * Updated so the ascii values for the bytes are aligned to each byte. * Gave the table a title and reduce the width to 50% Signed-off-by: An Nguyen <annguyen@ilm.com> * Added missing 4 bytes missing from the dataWindow value and displayWindow value Signed-off-by: An Nguyen <annguyen@ilm.com> * Added the sample.exr file Signed-off-by: An Nguyen <annguyen@ilm.com> * Annotated the attribute values more for the header. Should be a bit clearer. Signed-off-by: An Nguyen <annguyen@ilm.com> * Adding the sample.exr file was documented. Signed-off-by: An Nguyen <annguyen@ilm.com> * Added download link to the sample.exr file. Signed-off-by: An Nguyen <annguyen@ilm.com> * Move the download link above the table. Updated the paragraph before the table to describe the table Signed-off-by: An Nguyen <annguyen@ilm.com> * Move the sample.exr image into the downloads directory to match the target destination naming scheme to avoid confusion where the files go when built Signed-off-by: An Nguyen <annguyen@ilm.com> * Updated the table to annotate the type and literal as type. Signed-off-by: An Nguyen <annguyen@ilm.com> --------- Signed-off-by: An Nguyen <annguyen@ilm.com>
…les.rst (AcademySoftwareFoundation#1583) * Converting code-blocks to literalincludes in ReadingAndWritingImageFiles.rst Signed-off-by: Megha S <megha199501@gmail.com> * Addressed review comments Signed-off-by: Megha S <megha199501@gmail.com> * Changing from std::clamp to Imath::clamp Signed-off-by: Megha S <megha199501@gmail.com> --------- Signed-off-by: Megha S <megha199501@gmail.com>
…#1597) The .mailmap file maps author/committer names and emails to canonical real names and email addresses. This also updates the CONTRIBUTORS.md file with missing names from the git logs. This information is to the best of our knowledge, but please submit any corrections if you prefer. Signed-off-by: Cary Phillips <cary@ilm.com>
* Release notes for v2.5.10 Signed-off-by: Cary Phillips <cary@ilm.com> * News for v2.5.10 Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com>
Default behavior enable_bzlmod was switch (bazelbuild/bazel#18958) Bump Bazel version to 7.0.0 Update Bazel modules Apply buildifier on MODULE.bazel Signed-off-by: Vertexwahn <julian.amann@tum.de>
- added example C/C++ Code scanner using the Snyk GitHub Action. The `--unmanaged` flag indicates this is for a C/C++ codebase. In this example, it currently scans on a new pull request to the 'main' branch. The repository administrator should set both the SNYK_ORG and SNYK_TOKEN environment variables before merging this PR. The environment variables can be obtained from the LFX Security team. - added *.h, *.c, *.cpp filter to only run the scan when source files are changed Signed-off-by: David Deal <ddeal@linuxfoundation.org>
Signed-off-by: Vertexwahn <julian.amann@tum.de>
The #includes were incorrect. Signed-off-by: Cary Phillips <cary@ilm.com>
* Update MacPorts install instructions Signed-off-by: Cary Phillips <cary@ilm.com> * remove sudo Signed-off-by: Cary Phillips <cary@ilm.com> * mention vcpkg for Windows Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com>
* Support cmake config and shared library for libdeflate When not using the internal deflate, the only option was pkgconfig which is not well supported on Windows. This adds support for using the libdeflate cmake config files when available. This change also affects the generated OpenEXR cmake config files. For a static OpenEXR library, INTERFACE_LINK_LIBRARIES now appropriately includes libdeflate along with the existing dependencies like Imath. It also turns the internal libdeflate into a target for consistency. Resolves AcademySoftwareFoundation#1588 Signed-off-by: Brecht Van Lommel <brecht@blender.org> * Back out of adding a target for internal libdeflate Signed-off-by: Brecht Van Lommel <brecht@blender.org> * Use Requires.private for generated pkgconfig file Signed-off-by: Brecht Van Lommel <brecht@blender.org> --------- Signed-off-by: Brecht Van Lommel <brecht@blender.org>
…tion (AcademySoftwareFoundation#1621) * Add explanation of the distinction between OpenEXR/OpenEXRCore to API section This was described in the release notes but was never addressed in the actual online documentation, where it was not, in fact, obvious. Signed-off-by: Cary Phillips <cary@ilm.com> * Update website/API.rst Co-authored-by: Nick Porcino <meshula@hotmail.com> Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com> Co-authored-by: Nick Porcino <meshula@hotmail.com>
…cademySoftwareFoundation#1622) Signed-off-by: Cary Phillips <cary@ilm.com>
…reFoundation#1620) Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Vertexwahn <julian.amann@tum.de>
* Document security expectations Signed-off-by: Cary Phillips <cary@ilm.com> * Menion Imath as a dependency Signed-off-by: Cary Phillips <cary@ilm.com> * Update SECURITY.md Co-authored-by: Nick Porcino <meshula@hotmail.com> Signed-off-by: Cary Phillips <cary@ilm.com> * change 'Threat Model' to 'Potential Vulnerabilties' Signed-off-by: Cary Phillips <cary@ilm.com> * Mention GitHub issue as fallback security contact Signed-off-by: Cary Phillips <cary@ilm.com> * github security advisory Signed-off-by: Cary Phillips <cary@ilm.com> * mention exrcheck Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com> Co-authored-by: Nick Porcino <meshula@hotmail.com>
* Add uninstall target Satisfy the OpenSSF Best Practices Badge requirement for an insta/uninstall process: https://www.bestpractices.dev/en/criteria/1#1.installation_common CMake does not support a standard "uninstall" target, but the community recommends implementing an "uninstal" target that remove files named in the `install_manifest.txt`: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake However, our existing process of installing the symlink to the "bare" library, i.e. the symlink from libImath-3_2.so to libImath.so, fails to add the symlink to the manifest, so "make uninstall" misses the symlink. The existing mechanism use "install(CODE execute_process(cmake -E create_symlink))". This changes that to use a simpler "file(CREATE_LINK)" and "install(FILES)" to accomplish the same thing while also registering the symlink the the manifest. Also, this fixes an issue where `OpenEXRConfig.h` was passed to `install()` twice, producing two entries in `install_manifest.txt`. Signed-off-by: Cary Phillips <cary@ilm.com> * mention uninstall in install instructions Signed-off-by: Cary Phillips <cary@ilm.com> * poke Signed-off-by: Cary Phillips <cary@ilm.com> * COPY_ON_ERROR Signed-off-by: Cary Phillips <cary@ilm.com> * clarify the uninstall instructions Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com>
This workflow is causing errors on each PR: Snyk is missing auth token in order to run inside CI. You must include your API token as an environment value: `SNYK_TOKEN=12345678` Error: Process completed with exit code 2. As discussed on AcademySoftwareFoundation#1608, the preferred workflow will run weekly, not on PR. Signed-off-by: Cary Phillips <cary@ilm.com>
PR AcademySoftwareFoundation#1624 caused the .so symlink without the `OPENEXR_LIB_SUFFIX` (e.g. libOpenEXR.so which links to libOpenEXR-3_2.so) to get created in the wrong directory. This caused certain invocations of cmake to fail, even though the invocation in the CI succeeded. It's not at all clear why. This also changes the CI to invoke cmake in the way that previously failed (e.g. from the top-level directory with `-B` and `-S`), as an additional check. Signed-off-by: Cary Phillips <cary@ilm.com>
…undation#1634) When there is a loop trying to get scan / tile info that is ignoring return values, add a shortcut to avoid trying to reconstruct the chunk table every time. This will still respect the strict header flag, either returning an error immediately (strict), or (non-strict) enabling a multi-part file with only partially corrupt parts to work. Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: John Mertic <jmertic@linuxfoundation.org>
…1629) * Build python wheels via scikit-build-core This converts the setuptools configuration for building python wheels to use scikit-build-core, which has better support for CMake. There is no more setup.py; the configuration is entirely in `pyproject.toml` and the compile/link is done exclusively via cmake. The build/publish policy is: * A PR that changes any of the python wheel source/configuration (src/wrappers/python/* or .github/workflows/python-wheels.yml) triggers a build as a check. * PRs that change other library source do *not* trigger a build of the python wheels. Note that the primary CI workflow does build and test the bindings, although only for a single python version on a single arch for Linux/macOS/Windows. The wheel building validates multiple python versions and architectures, but involves signifant computation/time. Currently, the python wheels are a thin wrapper about basic read/write functions that don't add significant additional functionality to the library. Any potential problem will almost certainly get caught by the primary CI. * A tag of the form `v3.[0-9]+.[0-9]+-rc*` (e.g. `v3.2.4-rc`) triggers a full build of the wheels followed by a publish to `test.pypi.org`. This validates release candidates. * Publishing a release triggers a full build of the wheels followed by a publish to `pypi.org`. Signed-off-by: Cary Phillips <cary@ilm.com> * Add custom README.md for pypi.org Signed-off-by: Cary Phillips <cary@ilm.com> * fix typo Signed-off-by: Cary Phillips <cary@ilm.com> * reference src/wrappers/python/README.md in pyproject.toml Signed-off-by: Cary Phillips <cary@ilm.com> * Add copyright notice Signed-off-by: Cary Phillips <cary@ilm.com> * Update pyproject.toml Co-authored-by: Jean-Christophe Morin <38703886+JeanChristopheMorinPerso@users.noreply.github.com> Signed-off-by: Cary Phillips <cary@ilm.com> * Update pyproject.toml Co-authored-by: Jean-Christophe Morin <38703886+JeanChristopheMorinPerso@users.noreply.github.com> Signed-off-by: Cary Phillips <cary@ilm.com> * Update src/wrappers/python/CMakeLists.txt Co-authored-by: Jean-Christophe Morin <38703886+JeanChristopheMorinPerso@users.noreply.github.com> Signed-off-by: Cary Phillips <cary@ilm.com> * Add uninstall target (AcademySoftwareFoundation#1624) * Add uninstall target Satisfy the OpenSSF Best Practices Badge requirement for an insta/uninstall process: https://www.bestpractices.dev/en/criteria/1#1.installation_common CMake does not support a standard "uninstall" target, but the community recommends implementing an "uninstal" target that remove files named in the `install_manifest.txt`: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake However, our existing process of installing the symlink to the "bare" library, i.e. the symlink from libImath-3_2.so to libImath.so, fails to add the symlink to the manifest, so "make uninstall" misses the symlink. The existing mechanism use "install(CODE execute_process(cmake -E create_symlink))". This changes that to use a simpler "file(CREATE_LINK)" and "install(FILES)" to accomplish the same thing while also registering the symlink the the manifest. Also, this fixes an issue where `OpenEXRConfig.h` was passed to `install()` twice, producing two entries in `install_manifest.txt`. Signed-off-by: Cary Phillips <cary@ilm.com> * mention uninstall in install instructions Signed-off-by: Cary Phillips <cary@ilm.com> * poke Signed-off-by: Cary Phillips <cary@ilm.com> * COPY_ON_ERROR Signed-off-by: Cary Phillips <cary@ilm.com> * clarify the uninstall instructions Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com> * Add cmake.targets and OPENEXR_INSTALL=OFF Signed-off-by: Cary Phillips <cary@ilm.com> * INSTALL_TOOLS=OFF Signed-off-by: Cary Phillips <cary@ilm.com> * propogate OPENEXR_INSTALL to Imath Signed-off-by: Cary Phillips <cary@ilm.com> * test1 Signed-off-by: Cary Phillips <cary@ilm.com> * OPENEXR_INSTALL_PKG_CONFIG Signed-off-by: Cary Phillips <cary@ilm.com> * Fix CVE 2023 5841 (AcademySoftwareFoundation#1627) * enable deep file checks for core Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * fix possible int overflow Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * fix validation of deep sample counts Addresses CVE-2023-5841, fixing sample count check to not only check against 0 but previous sample as well. Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * add clarifying comment Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> --------- Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * Bazel support: Bump Imath to 3.1.10 (AcademySoftwareFoundation#1626) Signed-off-by: Vertexwahn <julian.amann@tum.de> * Document security expectations (AcademySoftwareFoundation#1623) * Document security expectations Signed-off-by: Cary Phillips <cary@ilm.com> * Menion Imath as a dependency Signed-off-by: Cary Phillips <cary@ilm.com> * Update SECURITY.md Co-authored-by: Nick Porcino <meshula@hotmail.com> Signed-off-by: Cary Phillips <cary@ilm.com> * change 'Threat Model' to 'Potential Vulnerabilties' Signed-off-by: Cary Phillips <cary@ilm.com> * Mention GitHub issue as fallback security contact Signed-off-by: Cary Phillips <cary@ilm.com> * github security advisory Signed-off-by: Cary Phillips <cary@ilm.com> * mention exrcheck Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com> Co-authored-by: Nick Porcino <meshula@hotmail.com> * Add uninstall target (AcademySoftwareFoundation#1624) * Add uninstall target Satisfy the OpenSSF Best Practices Badge requirement for an insta/uninstall process: https://www.bestpractices.dev/en/criteria/1#1.installation_common CMake does not support a standard "uninstall" target, but the community recommends implementing an "uninstal" target that remove files named in the `install_manifest.txt`: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake However, our existing process of installing the symlink to the "bare" library, i.e. the symlink from libImath-3_2.so to libImath.so, fails to add the symlink to the manifest, so "make uninstall" misses the symlink. The existing mechanism use "install(CODE execute_process(cmake -E create_symlink))". This changes that to use a simpler "file(CREATE_LINK)" and "install(FILES)" to accomplish the same thing while also registering the symlink the the manifest. Also, this fixes an issue where `OpenEXRConfig.h` was passed to `install()` twice, producing two entries in `install_manifest.txt`. Signed-off-by: Cary Phillips <cary@ilm.com> * mention uninstall in install instructions Signed-off-by: Cary Phillips <cary@ilm.com> * poke Signed-off-by: Cary Phillips <cary@ilm.com> * COPY_ON_ERROR Signed-off-by: Cary Phillips <cary@ilm.com> * clarify the uninstall instructions Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com> * Remove snyk-scan-pr.yml (AcademySoftwareFoundation#1631) This workflow is causing errors on each PR: Snyk is missing auth token in order to run inside CI. You must include your API token as an environment value: `SNYK_TOKEN=12345678` Error: Process completed with exit code 2. As discussed on AcademySoftwareFoundation#1608, the preferred workflow will run weekly, not on PR. Signed-off-by: Cary Phillips <cary@ilm.com> * fix issue with unpacking sample counts (AcademySoftwareFoundation#1630) When unpacking sample counts as "individual" counts (no longer monotonic), it writes the total sample count to a value 1 past the individual sample counts, but this is not in the packed data, so do not expect to unpack that many values. The buffer just needs to be allocated one value larger to avoid write past end of buffer which is taken care of in the update_pack_unpack_ptrs function Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * adjust checks for core to better match c++ checks (AcademySoftwareFoundation#1632) The core checks were not setting the same image / tile size limits and not disabling reads at quite the same level. Note: the core check does not read the entire image into a contiguous slice, so does not replicate the maximum deep sample checks in the same way, this is a source of potential false-negative failures This should address OSS-Fuzz 66491 and 66489 (different forms of the same failure where a large sample size allocation was happening), and are only constrained memory (2.5Gb) issues. Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * Fix install of symlink (AcademySoftwareFoundation#1633) PR AcademySoftwareFoundation#1624 caused the .so symlink without the `OPENEXR_LIB_SUFFIX` (e.g. libOpenEXR.so which links to libOpenEXR-3_2.so) to get created in the wrong directory. This caused certain invocations of cmake to fail, even though the invocation in the CI succeeded. It's not at all clear why. This also changes the CI to invoke cmake in the way that previously failed (e.g. from the top-level directory with `-B` and `-S`), as an additional check. Signed-off-by: Cary Phillips <cary@ilm.com> * adds a shortcut to avoid reconstructing every call (AcademySoftwareFoundation#1634) When there is a loop trying to get scan / tile info that is ignoring return values, add a shortcut to avoid trying to reconstruct the chunk table every time. This will still respect the strict header flag, either returning an error immediately (strict), or (non-strict) enabling a multi-part file with only partially corrupt parts to work. Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * check and control reduceMemory and reduceTime in stream mode (AcademySoftwareFoundation#1635) exrcheck by default uses file mode, but the fuzzer and exrcheck -s use stream mode, need to respect the memory and time flags consistently on that path as well. Will address OSS-Fuzz 66612, although real fix underlying is in AcademySoftwareFoundation#1634 Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> * Update .github/workflows/python-wheels-publish-test.yml Co-authored-by: Jean-Christophe Morin <38703886+JeanChristopheMorinPerso@users.noreply.github.com> Signed-off-by: Cary Phillips <cary@ilm.com> * Add sdist Signed-off-by: Cary Phillips <cary@ilm.com> * Update .github/workflows/python-wheels-publish-test.yml Co-authored-by: Jean-Christophe Morin <38703886+JeanChristopheMorinPerso@users.noreply.github.com> Signed-off-by: Cary Phillips <cary@ilm.com> * fix sdist; remove debugging Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com> Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> Signed-off-by: Vertexwahn <julian.amann@tum.de> Co-authored-by: Jean-Christophe Morin <38703886+JeanChristopheMorinPerso@users.noreply.github.com> Co-authored-by: Kimball Thurston <kdt3rd@gmail.com> Co-authored-by: Vertexwahn <julian.amann@tum.de> Co-authored-by: Nick Porcino <meshula@hotmail.com>
meshula
approved these changes
Feb 15, 2024
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.
Cherry-picked commits for a v3.2.3 release, for your preview. Highlights include:
bswapon NetBSDlibdeflateuninstallcmake targetThis release will addresses:
Merged Pull Requests: