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 PRs and release notes for v2.4.3 #1016

Merged
merged 11 commits into from
May 16, 2021

Conversation

cary-ilm
Copy link
Member

No description provided.

@meshula
Copy link
Contributor

meshula commented May 12, 2021

I can't find the problems in the mac logs, but in the linux log there's this -

45%] Building CXX object OpenEXR/IlmImf/CMakeFiles/IlmImf.dir/ImfScanLineInputFile.cpp.o
[ 45%] Building CXX object OpenEXR/IlmImf/CMakeFiles/IlmImf.dir/ImfTiledInputFile.cpp.o
/__w/1/s/OpenEXR/IlmImf/ImfScanLineInputFile.cpp: In member function 'void Imf_2_4::ScanLineInputFile::initialize(const Imf_2_4::Header&)':
/__w/1/s/OpenEXR/IlmImf/ImfScanLineInputFile.cpp:1114:35: error: cannot convert 'Imf_2_4::Compression' to 'Imf_2_4::Compressor*' for argument '1' to 'int Imf_2_4::numLinesInBuffer(Imf_2_4::Compressor*)'
             numLinesInBuffer (comp);
                                   ^
/__w/1/s/OpenEXR/IlmImf/ImfScanLineInputFile.cpp:1127:53: error: 'gLargeChunkTableSize' was not declared in this scope
         if (lineOffsetSize * _data->linesInBuffer > gLargeChunkTableSize)
                                                     ^~~~~~~~~~~~~~~~~~~~
/__w/1/s/OpenEXR/IlmImf/ImfScanLineInputFile.cpp:1173:13: error: redeclaration of 'int lineOffsetSize'
         int lineOffsetSize = (dataWindow.max.y - dataWindow.min.y +
             ^~~~~~~~~~~~~~
/__w/1/s/OpenEXR/IlmImf/ImfScanLineInputFile.cpp:1116:13: note: 'int lineOffsetSize' previously declared here
         int lineOffsetSize = (dataWindow.max.y - dataWindow.min.y +
             ^~~~~~~~~~~~~~
OpenEXR/IlmImf/CMakeFiles/IlmImf.dir/build.make:694: recipe for target 'OpenEXR/IlmImf/CMakeFiles/IlmImf.dir/ImfScanLineInputFile.cpp.o' failed
gmake[2]: *** [OpenEXR/IlmImf/CMakeFiles/IlmImf.dir/ImfScanLineInputFile.cpp.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
[ 45%] Building CXX object PyIlmBase/PyImath/CMakeFiles/PyImath_Python2_7.dir/PyImathPlane.cpp.o

@cary-ilm
Copy link
Member Author

My bad, I missed some commits. Retrying now.

peterhillman and others added 10 commits May 12, 2021 14:33
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>
…eFoundation#825)

* Avoid overflow in calculateNumTiles when size=MAX_INT

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

* Compute level size with 64 bits to avoid overflow

Signed-off-by: Cary Phillips <cary@ilm.com>
…e API (AcademySoftwareFoundation#830)

* refactor channel filling in InputFile API with tiled source

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

* handle edge-case of empty framebuffer

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


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


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

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

Co-authored-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>
…ations (AcademySoftwareFoundation#824)

* reduce size limit for scanline files; protect against large chunkoffset allocations

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

* bugfix for memory limit changes

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

* rearrange chunkoffset test to protect bytesperline table too

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

* remove extraneous function declaration; tidy comments

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

meshula commented May 13, 2021

Windows is failing on not being able to retrieve a boost archive.


Mode                LastWriteTime         Length Name                                                                  
----                -------------         ------ ----                                                                  
d-----        5/12/2021   9:57 PM                _boost                                                                
Retrieving http://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.zip
Invoke-WebRequest : Forbidden!
At D:\a\1\s\share\ci\scripts\windows\install_boost.ps1:23 char:1
+ Invoke-WebRequest $boostArchive -OutFile "boost-${boostVersion}.zip"
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : InvalidOperation: (System.Net.HttpWebRequest:HttpWebRequest) [Invoke-WebRequest], WebExc 
   eption

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.

I don't think the CI failures have anything to do with this change.

@cary-ilm
Copy link
Member Author

@meshula, I believe that's true. Because it's RB-2.4, it's triggering the old Azure build. Just to confirm before release, can you try downloading the branch to Windows and making sure it builds?

@meshula
Copy link
Contributor

meshula commented May 13, 2021

Done ~ it builds and installs successfully on Windows.

Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm merged commit 2aac383 into AcademySoftwareFoundation:RB-2.4 May 16, 2021
@cary-ilm cary-ilm deleted the patches-2.4.3 branch May 18, 2021 03:25
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.

None yet

3 participants