Merge pull request #273 from goddardl/coverity

Minor fixes for issues highlighted by Coverity.

Author: ldmoser

src/IECore/DeepPixel.cpp

@@ -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
@@ -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() ) );
@@ -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() ) );

src/IECore/LensDistortOp.cpp

@@ -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
@@ -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;

src/IECoreRI/SHWDeepImageWriter.cpp

@@ -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
@@ -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 ) );
@@ -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 );
 
@@ -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." ) );
 	}