Integrate C++11 branch into 5_1-new

This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
444 changed files with 19503 additions and 21007 deletions
+2 -2
View File
@@ -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 );