actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The big NULL replacement party part 3.

Browse Source 
Getting there I think.
This commit is contained in:
Jason Felds
2013-05-03 23:16:39 -04:00
parent ba59dd1656
commit a3f37dc2b4
73 changed files with 1880 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurface_Load_XPM.cpp
+5 -5
View File
@@ -11,7 +11,7 @@
#define CheckLine() \
if( xpm[line] == nullptr ) { \
error = "short file"; \
return NULL; \
return nullptr; \
}
RageSurface *RageSurface_Load_XPM( char * const *xpm, RString &error )
@@ -24,13 +24,13 @@ RageSurface *RageSurface_Load_XPM( char * const *xpm, RString &error )
if( sscanf( xpm[line++], "%i %i %i %i", &width, &height, &num_colors, &color_length ) != 4 )
{
error = "parse error reading specs";
return NULL;
return nullptr;
}
if( width > 2048 || height > 2048 || num_colors > 1024*16 || color_length > 4 )
{
error = "spec error";
return NULL;
return nullptr;
}
vector<RageSurfaceColor> colors;
@@ -85,7 +85,7 @@ RageSurface *RageSurface_Load_XPM( char * const *xpm, RString &error )
{
error = ssprintf( "row %i is not expected length (%i != %i)", y, int(row.size()), width*color_length );
delete img;
return NULL;
return nullptr;
}
int8_t *p = (int8_t *) img->pixels;
@@ -100,7 +100,7 @@ RageSurface *RageSurface_Load_XPM( char * const *xpm, RString &error )
{
error = ssprintf( "%ix%i is unknown color \"%s\"", x, y, color_name.c_str() );
delete img;
return NULL;
return nullptr;
}
if( colors.size() <= 256 )