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

v3.1.3 patches #1181

Merged
merged 37 commits into from
Oct 24, 2021
Merged

Conversation

cary-ilm
Copy link
Member

Cherry-picked commits for v3.1.3. See CHANGES.md for the list of PR's.

This is a first pass, we can add further changes to it before merging.

Also, we agreed to bend the libtool versioning rules and call the library version 30.3.0 (v3.1.2 was 30.2.0), even though strictly speaking the revision should be bumped because we added to the API. But v3.1.3 should be drop-in compatible with v3.1.2 (even with the compression level changes).

kdt3rd and others added 28 commits October 13, 2021 15:10
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
NB: This changes the ABI of ImfHeader, so must be a 3.2 feature

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
with unit tests

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
…C core

Also adds the mechanism to the context initializer

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
…ame time

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Also, comment the more complex workaround to get to a stable static
destruction state when compiling to static libraries

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
… coordinate (AcademySoftwareFoundation#1164)

oss fuzz 39399

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
…reFoundation#1165)

normal file semantics will return 0 for this indicating EOF

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
* fix dataWindow width signed calc
* use int64_t in CheckFile loop to prevent wraparound
* tile indexes should start from 0 not datawin.min

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
…flow (AcademySoftwareFoundation#1169)

OSS Fuzz 39522, 39526, 39529

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
* Avoid uninitialized memory error in non-sanitized libstdc++

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* Refactor attribute size checks

for large attribute chunks, clear memory earlier, centralize file size
check, fix uninitialized memory error with memory sanitizer

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* Fix typo

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
…areFoundation#1125)

In my test of 18 various exr files (total raw data size 1057MB):
- zip 6: 2.452x ratio, 206MB/s compression
- zip 4: 2.421x ratio, 437MB/s compression

So a tiny drop of compression ratio, but compression is more than 2x faster. This makes writing zip faster than writing uncompressed (386MB/s). Decompression speed unaffected.

Signed-off-by: Aras Pranckevicius <aras@unity3d.com>
* Fix issues with fuzz test driver

- Adds a (disabled) error handler print to make th test cases easier to
part
- Fixes an initialization of buffers to use the better half
- mark a couple of functions internal (static)

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* Add chunk for offsets in chunk table to be (somewhat validate)

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* Clarify comment, simplify logic check

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* Add check in mirror decode pipeline for alloc of 0 bytes

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* Adjust logic so we can handle single scanline compression with image sampling

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

* switch to controlling prints for checking behind a getenv

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
* Remove local copies of outdated CLA's

Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
@lgritz
Copy link
Contributor

lgritz commented Oct 14, 2021

Hi, please don't release until we get a fix for the broken deep reads with the core library that was caused by #1169.

@cary-ilm
Copy link
Member Author

Yes, just getting it started.

kdt3rd and others added 9 commits October 21, 2021 15:20
When we started core, there was a thought to allow an empty image to
enable a metadata part. However, this needs wider support and causes
regressions from the existing c++ behavior

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
…eFoundation#1184)

This fixes an issue when the y_sampling is larger than the height of a
chunk (and the height is not 1). Further, adds casts, use larger type to
avoid overflow

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
…ion#1187)

Accidentally giving a folder name to the program exposed that the c++
library returns very large results for seeking to the end of a directory
file node, handle and return quickly

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
- Multiple Linux builds only for VFXP-2021 (current).
- Single Linux build for other VFX platform years.
- Add Linux legacy C++11 build.
- Update Mac and Windows builds for VFXP-2021/2022

Signed-off-by: Christina Tempelaar-Lietz <xlietz@gmail.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Copy link
Contributor

@meshula meshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these cherry-picks seem appropriate to the release.

@cary-ilm cary-ilm merged commit 697cc44 into AcademySoftwareFoundation:RB-3.1 Oct 24, 2021
@cary-ilm cary-ilm deleted the v3.1.3-patches branch November 5, 2022 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants