Merge branch 'master' into 'dev' #3061
Open
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
- Fix failure to return dynamically allocated memory (two separate instances). - Fix orientation of exported PNGs in some use cases. - Fix excessive memory allocation for images spread across multiple PNG files. - When reading from multiple input PNG images, allocate memory for read buffers on a per-slice basis.
- Do not attempt to support writing bitwise images, even if the number of pixels in the width direction is a factor of 8. - Fix intensity scaling of bitwise images such that values of 0 and 255 are used in the output uint8 image. Add test data and tests for verifying operation of PNG export.
Partial regression of 76d7007.
- Fix erroneous modification of strides upon header concatenation; this replicates the fix included in 41c02e9 as part of #2806, but is necessary for the suite of fixes here to work. Note that this affects mrcat in addition to multi-image format handling. - Fix setting of strides upon PNG read. - Expand testing of PNG handling. Evaluation of read and write functionality is performed separately, with the reference data fully visible and verifiable within the test data repository. Some previous tests bundled read and write testing together, which obscured the erroneous intermediate interpretation.
- Omit explicit deletion of ImageIO::Base data where unnecessary; this can be handled by ImageIO::Base::close(). - FIx additional memory leaks in ImageIO::PNG.
Lots of manual merging by Robert E. Smith <[email protected]>
…o_dev Manual merge of the contents of #2713 onto dev, as they were omitted from 9896ccf. Includes updating the commit hash for the "test_data" repository, which merges the changes to test data implemented as part of #2713 onto the dev branch version of those test data. Conflicts: core/file/png.cpp core/file/png.h core/formats/png.cpp core/header.cpp core/image_io/png.cpp core/image_io/scratch.cpp core/image_io/tiff.cpp core/image_io/variable_scaling.cpp core/image_io/variable_scaling.h cpp/core/image_io/pipe.h cpp/core/image_io/png.h cpp/core/image_io/ram.cpp cpp/core/image_io/scratch.h testing/binaries/data testing/binaries/tests/mrconvert~0411e034e23801672354bda98700491cff8e4f73
Lestropie
added a commit
that referenced
this pull request
Jan 15, 2025
Resolution of content merged to dev initially omitted from #3061. - #2693 (completely omitted) - #3005 (partial propagation / independent address of some common issues on both branches) - #3001 (completely omitted) - #2908 (completely omitted) - #2955 (completely omitted) - #2600 (completely omitted) - #2962 (completely omitted) - #2935 (completely omitted) - #2923 (completely omitted) - #2910 (completely omitted) - #2638 (completely omitted) - #2698 (completely omitted) - #2721 (completely omitted) - #2794 (completely omitted) - #2768 (completely omitted; required modification to conform to other dev changes) - #2713 (residual compilation errors following adf8fdd, including resolution against changes in #2437 on dev.
Resolution of content merged to dev initially omitted from #3061. - #2693 (completely omitted) - #3005 (partial propagation / independent address of some common issues on both branches) - #3001 (completely omitted) - #2908 (completely omitted) - #2955 (completely omitted) - #2600 (completely omitted) - #2962 (completely omitted) - #2935 (completely omitted) - #2923 (completely omitted) - #2910 (completely omitted) - #2638 (completely omitted) - #2698 (completely omitted) - #2721 (completely omitted) - #2794 (completely omitted) - #2768 (completely omitted; required modification to conform to other dev changes) - #2713 (residual compilation errors following adf8fdd, including resolution against changes in #2437 on dev.
Lestropie
force-pushed
the
master_to_dev
branch
from
eb4e8e1 to
ee6f060
Compare
Lestropie
added a commit
that referenced
this pull request
Jan 15, 2025
Lestropie
force-pushed
the
master_to_dev
branch
from
7cc9352 to
2f62732
Compare
- Install libpng-dev on Linux GCC workflow so that mrconvert tests involving the PNG format can succeed. - Modify DEBUG call in ImageIO::PNG::load(): concatenation of an empty string seemingly causing a string overflow when compiling on Windows.
|
@daljit46: Clang-tidy is currently failing for reasons other than the content of the PR; are you able to have a look? |
|
It seems like we need to update our |
Go separate: better provenance, and it's not a CI block here anyway. |
This was referenced Jan 20, 2025
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.
Merge of current
masterintodev, necessary for PRs targetingdevto pass CI checks.masterintodevand link that here: Master to dev #2893 (May 9 2024)masterthat have been merged since this process was last performed, then ensure that no relevant changes have been lost in the manual merging process:devgiven reduced support of older Python versions)devenforces Python >=3.7 (I think; f-strings are 3.6, but got a feeling there might be something else that's >=3.7).