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

Remove deprecated argument to getChunkOffsetTableSize() #988

Merged
merged 2 commits into from
Mar 28, 2021
Merged

Remove deprecated argument to getChunkOffsetTableSize() #988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ef566d
Remove deprecated argument to getChunkOffsetTableSize()
cary-ilm Mar 25, 2021
f853e5d
Remove mention of deprecated_attribute from comment
cary-ilm Mar 28, 2021
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
2 changes: 1 addition & 1 deletion src/bin/exrmaketiled/makeTiled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ makeTiled (const char inFileName[],
// set tileDescription, type, and chunckcount for multipart
//
header.setType(TILEDIMAGE);
int chunkcount = getChunkOffsetTableSize(header, true);
int chunkcount = getChunkOffsetTableSize(header);
header.setChunkCount(chunkcount);

headers.push_back(header);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXR/ImfMisc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@ int
getTiledChunkOffsetTableSize(const Header& header);

int
getChunkOffsetTableSize(const Header& header,bool)
getChunkOffsetTableSize(const Header& header)
{
//
// if there is a type in the header which indicates the part is not a currently supported type,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXR/ImfMisc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ bool usesLongNames (const Header &header);
//

IMF_EXPORT
int getChunkOffsetTableSize(const Header& header,bool deprecated_attribute=false);
int getChunkOffsetTableSize(const Header& header);
Copy link
Contributor

Choose a reason for hiding this comment

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

Should the comment about the deprecated_attribute be removed (line 440) as well as the parameter itself?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, thanks.



OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT
Expand Down
2 changes: 1 addition & 1 deletion src/test/OpenEXRTest/testFutureProofing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ generateRandomHeaders (int partCount, vector<Header>& headers)
// future types MUST have a chunkCount attribute - ommitting causes the library
// to raise an exception (can't compute chunkOffsetTable) and prevents us from reading
// the rest of the image
header.setChunkCount(getChunkOffsetTableSize(header,true));
header.setChunkCount(getChunkOffsetTableSize(header));
headers.push_back(header);
}
}
Expand Down