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

Cherry-pick PR's into the RB-2.5 branch for v2.5.5 release #917

Merged
merged 15 commits into from Feb 12, 2021

Conversation

cary-ilm
Copy link
Member

@cary-ilm cary-ilm commented Feb 6, 2021

No description provided.

hjmallon and others added 14 commits February 5, 2021 15:17
…arm64 macOS"

This reverts commit 67053eb.

Signed-off-by: Harry Mallon <hjmallon@gmail.com>
* In these types of builds we want arm64 and x86_64 (with AVX optimisations).
  However the way cmake works (with `CMAKE_OSX_ARCHITECTURES="arm64;x86_64"`
  means that we share one OpenEXRConfigInternal.h between both builds. So
  we have to have OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX mean "AVX GCC asm is
  available if platform is x86", rather than "AVX GCC asm is available".
  Then we decide on AVX optimisations based on that #define and also the
  platform defines.

Signed-off-by: Harry Mallon <hjmallon@gmail.com>
…undation#893)

* Include <limits> where required by newer compilers

Signed-off-by: Cary Phillips <cary@ilm.com>

* Removed redundant #include <limits>

Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
)

* Use size_t for DWA buffersize calculation

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>

* use Int64 instead of size_t for buffersize calculations

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Signed-off-by: Cary Phillips <cary@ilm.com>
…emySoftwareFoundation#903)

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Signed-off-by: Cary Phillips <cary@ilm.com>
…ation#910)

* update tileoffset sanitycheck to handle ripmaps

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>

* slight reorganization

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>

* slight reorganization

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>

* remove extra if statement from validateStreamSize

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Signed-off-by: Cary Phillips <cary@ilm.com>
)

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.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.

lgtm

Copy link
Contributor

@peterhillman peterhillman left a comment

Choose a reason for hiding this comment

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

Assuming it's OK to change memory layout and add the validateStreamSize function to DeepTiledInputFile, all looks good to me

char* _outBuffer;
Int64 _outBufferSize;
char* _planarUncBuffer[NUM_COMPRESSOR_SCHEMES];
Int64 _planarUncBufferSize[NUM_COMPRESSOR_SCHEMES];
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it OK to change the memory layout of DwaCompressor for 32 bit systems between point releases? I assume it's OK, as the object isn't part of the API. I can imagine some horrific situation where a host application is linked against 2.2.4 but loads plugins linked against 2.2.5, and DwaCompressor object created by the 2.2.5 library gets passed to a 2.2.4 method.
(This should all be fine on systems where sizeof(size_t) == sizeof(Int64))

Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm merged commit 4212416 into AcademySoftwareFoundation:RB-2.5 Feb 12, 2021
@cary-ilm cary-ilm deleted the fixes-2.5.5 branch May 18, 2021 03:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants