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.

Sign up for GitHub

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

Jump to bottom

use 64 bit computation in chunk offset table reconstruction #788

Merged
merged 4 commits into from
Jul 18, 2020
Merged

use 64 bit computation in chunk offset table reconstruction #788

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ae52d3
use 64 bit computation in chunkoffsettable reconstruction
peterhillman Jul 16, 2020
e73541a
use ll in chunk size computation
peterhillman Jul 16, 2020
761bca0
Merge branch 'master' into chunkrecon_overflow
cary-ilm Jul 18, 2020
29e5f15
Merge branch 'master' into chunkrecon_overflow
cary-ilm Jul 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions OpenEXR/IlmImf/ImfMultiPartInputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,15 +626,15 @@ MultiPartInputFile::Data::chunkOffsetReconstruction(OPENEXR_IMF_INTERNAL_NAMESPA
OPENEXR_IMF_INTERNAL_NAMESPACE::Xdr::read <OPENEXR_IMF_INTERNAL_NAMESPACE::StreamIO> (is, packed_sample);

//add 40 byte header to packed sizes (tile coordinates, packed sizes, unpacked size)
size_of_chunk=packed_offset+packed_sample+40;
size_of_chunk=packed_offset+packed_sample + 40ll;
}
else
{

// regular image has 20 bytes of header, 4 byte chunksize;
int chunksize;
OPENEXR_IMF_INTERNAL_NAMESPACE::Xdr::read <OPENEXR_IMF_INTERNAL_NAMESPACE::StreamIO> (is, chunksize);
size_of_chunk=chunksize+20;
size_of_chunk=static_cast<Int64>(chunksize) + 20ll;
}
}
else
Expand Down Expand Up @@ -665,13 +665,13 @@ MultiPartInputFile::Data::chunkOffsetReconstruction(OPENEXR_IMF_INTERNAL_NAMESPA
OPENEXR_IMF_INTERNAL_NAMESPACE::Xdr::read <OPENEXR_IMF_INTERNAL_NAMESPACE::StreamIO> (is, packed_sample);


size_of_chunk=packed_offset+packed_sample+28;
size_of_chunk=packed_offset+packed_sample + 28ll;
}
else
{
int chunksize;
OPENEXR_IMF_INTERNAL_NAMESPACE::Xdr::read <OPENEXR_IMF_INTERNAL_NAMESPACE::StreamIO> (is, chunksize);
size_of_chunk=chunksize+8;
size_of_chunk=static_cast<Int64>(chunksize) + 8ll;
}

}
Expand Down