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

prevent invalid values in Channel's PixelType enum #785

Merged
merged 2 commits into from
Jul 18, 2020
Merged

prevent invalid values in Channel's PixelType enum #785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6da955b
prevent invalid values in Channel's PixelType enum
peterhillman Jul 16, 2020
603b9e5
Merge branch 'master' into channeltype_enum_fix
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
13 changes: 13 additions & 0 deletions OpenEXR/IlmImf/ImfChannelListAttribute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,19 @@ ChannelListAttribute::readValueFrom (IStream &is,
Xdr::read <StreamIO> (is, xSampling);
Xdr::read <StreamIO> (is, ySampling);

//
// prevent invalid values being written to PixelType enum
// by forcing all unknown types to NUM_PIXELTYPES which is also an invalid
// pixel type, but can be used as a PixelType enum value
// (Header::sanityCheck will throw an exception when files with invalid PixelTypes are read)
//
if (type != OPENEXR_IMF_INTERNAL_NAMESPACE::UINT &&
type != OPENEXR_IMF_INTERNAL_NAMESPACE::HALF &&
type != OPENEXR_IMF_INTERNAL_NAMESPACE::FLOAT)
{
type = OPENEXR_IMF_INTERNAL_NAMESPACE::NUM_PIXELTYPES;
}

_value.insert (name, Channel (PixelType (type),
xSampling,
ySampling,
Expand Down