Skip to content

Commit 7d1c9c4

Browse files
authored
Merge pull request #1277 from danieldresser-ie/wextra2
Fix More Compile Issues With -Wextra
2 parents 18eb233 + 3773993 commit 7d1c9c4

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

src/IECoreMaya/ImageFile.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,10 @@ MStatus ImageFile::glLoad( const MImageFileInfo& info, unsigned int idx )
290290
{
291291
case 3:
292292
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, m_width, m_height, 0, GL_RGB, GL_FLOAT, &pixels[0] );
293+
break;
293294
case 4:
294295
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, m_width, m_height, 0, GL_RGBA, GL_FLOAT, &pixels[0] );
296+
break;
295297
default:
296298
assert(false);
297299
}

src/IECoreNuke/DisplayIop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ using namespace Imath;
6565
typedef LRUCache<int, DisplayDriverServerPtr> ServerCache;
6666

6767
// key is the port number for the server.
68-
static DisplayDriverServerPtr serverCacheGetter( int key, size_t cost )
68+
static DisplayDriverServerPtr serverCacheGetter( int key, size_t &cost )
6969
{
7070
cost = 1;
7171
return new DisplayDriverServer( key );

src/IECoreNuke/FromNukeCameraConverter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ IECore::ObjectPtr FromNukeCameraConverter::doConversion( IECore::ConstCompoundOb
7979
case DD::Image::CameraOp::LENS_RENDER_CAMERA :
8080
msg( Msg::Warning, "FromNukeCameraConverter::doConversion", "Unsupported projection type - reverting to orthographic" );
8181
// fall through to orthographic code
82+
[[fallthrough]];
8283
case DD::Image::CameraOp::LENS_ORTHOGRAPHIC :
8384
{
8485
result->setProjection( "orthographic" );

0 commit comments

Comments
 (0)