Integrate C++11 branch into 5_1-new
This commit is contained in:
@@ -399,14 +399,14 @@ static RageSurface *ReadImage( RageFile &f, int len, int height,
|
||||
if( !state.Init(f) )
|
||||
{
|
||||
// RWSetMsg("error reading image");
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
/* If this is an "uninteresting picture" ignore it. */
|
||||
if( ignore )
|
||||
{
|
||||
while( state.ReadByte(f) >= 0 )
|
||||
;
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
RageSurface *image = CreateSurface( len, height, 8, 0, 0, 0, 0 );
|
||||
|
||||
Reference in New Issue
Block a user