Skip to content

Minor fixes for issues highlighted by Coverity. #273

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

Merged
merged 3 commits into from
May 16, 2014
Merged

Minor fixes for issues highlighted by Coverity. #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86f7100
Initializing the m_mode member within the constructor.
goddardl May 15, 2014
4a92103
Fixed an uninitialized member in IECore::DeepPixel that could cause u…
goddardl May 15, 2014
ba11833
Fixed a bug in a sanity check in SHWDeepImageWriter.
goddardl May 15, 2014
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
6 changes: 4 additions & 2 deletions src/IECore/DeepPixel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2011, Image Engine Design Inc. All rights reserved.
// Copyright (c) 2011-2014, Image Engine Design Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -41,7 +41,8 @@
using namespace IECore;

DeepPixel::DeepPixel( const std::string channelNames, unsigned numSamples )
: m_channels( channelNames.size() )
: m_sorted( false ),
m_channels( channelNames.size() )
{
m_depthIndices.reserve( numSamples );
m_samples.reserve( numSamples * ( 1 + channelNames.size() ) );
Expand All @@ -54,6 +55,7 @@ DeepPixel::DeepPixel( const std::string channelNames, unsigned numSamples )
}

DeepPixel::DeepPixel( const std::vector<std::string> &channelNames, unsigned numSamples )
: m_sorted( false )
{
m_depthIndices.reserve( numSamples );
m_samples.reserve( numSamples * ( 1 + channelNames.size() ) );
Expand Down
5 changes: 3 additions & 2 deletions src/IECore/LensDistortOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
// Copyright (c) 2013-2014, Image Engine Design Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -55,7 +55,8 @@ LensDistortOp::LensDistortOp()
: WarpOp(
"Distorts an ImagePrimitive using a parametric lens model which is supplied as a .cob file. "
"The resulting image will have the same display window as the original with a different data window."
)
),
m_mode( kUndistort )
{

IntParameter::PresetsContainer modePresets;
Expand Down
8 changes: 4 additions & 4 deletions src/IECoreRI/SHWDeepImageWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012, Image Engine Design Inc. All rights reserved.
// Copyright (c) 2012-2014, Image Engine Design Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -49,7 +49,7 @@ const DeepImageWriter::DeepImageWriterDescription<SHWDeepImageWriter> SHWDeepIma

SHWDeepImageWriter::SHWDeepImageWriter()
: DeepImageWriter( "Writes 3delight SHW deep shadow file format." ),
m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 )
m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 ), m_alphaOffset( 0 )
{
std::vector<std::string> channels( 1, "A" );
m_channelsParameter->setValue( new StringVectorData( channels ) );
Expand All @@ -60,7 +60,7 @@ SHWDeepImageWriter::SHWDeepImageWriter()

SHWDeepImageWriter::SHWDeepImageWriter( const std::string &fileName )
: DeepImageWriter( "Writes 3delight SHW deep shadow file format." ),
m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 )
m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 ), m_alphaOffset( 0 )
{
m_fileNameParameter->setTypedValue( fileName );

Expand Down Expand Up @@ -164,7 +164,7 @@ void SHWDeepImageWriter::open()
throw InvalidArgumentException( std::string( "Tile size must be equal to or less than resolution." ) );
}

if ( ( ( tileSize.x & ( tileSize.x - 1 ) ) != 0 ) || ( ( tileSize.x & ( tileSize.x - 1 ) ) != 0 ) )
if ( ( ( tileSize.x & ( tileSize.x - 1 ) ) != 0 ) || ( ( tileSize.y & ( tileSize.y - 1 ) ) != 0 ) )
{
throw InvalidArgumentException( std::string( "Tile width and height must be a power of two." ) );
}
Expand Down