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

s/surf/img/

Browse Source
This commit is contained in:
Glenn Maynard
2004-05-18 06:53:26 +00:00
parent e72df28c97
commit e4cb3a253e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurface_Load_PNG.cpp
+11 -11
View File
@@ -79,12 +79,12 @@ static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
return NULL; return NULL;
} }
SDL_Surface *volatile surf = NULL; SDL_Surface *volatile img = NULL;
if( setjmp(png_jmpbuf(png)) ) if( setjmp(png_jmpbuf(png)) )
{ {
png_destroy_read_struct( &png, &info_ptr, png_infopp_NULL ); png_destroy_read_struct( &png, &info_ptr, png_infopp_NULL );
if( surf ) if( img )
SDL_FreeSurface( surf ); SDL_FreeSurface( img );
return NULL; return NULL;
} }
@@ -187,16 +187,16 @@ static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
switch( type ) switch( type )
{ {
case PALETTE: case PALETTE:
surf = SDL_CreateRGBSurfaceSane( SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0 ); img = SDL_CreateRGBSurfaceSane( SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0 );
mySDL_SetPalette( surf, colors, 0, 256 ); mySDL_SetPalette( img, colors, 0, 256 );
if( iColorKey != -1 ) if( iColorKey != -1 )
mySDL_AddColorKey( surf, iColorKey ); mySDL_AddColorKey( img, iColorKey );
break; break;
case RGBX: case RGBX:
case RGBA: case RGBA:
surf = SDL_CreateRGBSurfaceSane( SDL_SWSURFACE, width, height, 32, img = SDL_CreateRGBSurfaceSane( SDL_SWSURFACE, width, height, 32,
SDL_SwapBE32( 0xFF000000 ), SDL_SwapBE32( 0xFF000000 ),
SDL_SwapBE32( 0x00FF0000 ), SDL_SwapBE32( 0x00FF0000 ),
SDL_SwapBE32( 0x0000FF00 ), SDL_SwapBE32( 0x0000FF00 ),
@@ -205,22 +205,22 @@ static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
default: default:
FAIL_M(ssprintf( "%i", type) ); FAIL_M(ssprintf( "%i", type) );
} }
ASSERT( surf ); ASSERT( img );
/* alloca to prevent memleaks if libpng longjmps us */ /* alloca to prevent memleaks if libpng longjmps us */
png_byte **row_pointers = (png_byte **) alloca( sizeof(png_byte*) * height ); png_byte **row_pointers = (png_byte **) alloca( sizeof(png_byte*) * height );
for( unsigned y = 0; y < height; ++y ) for( unsigned y = 0; y < height; ++y )
{ {
png_byte *p = (png_byte *) surf->pixels; png_byte *p = (png_byte *) img->pixels;
row_pointers[y] = p + surf->pitch*y; row_pointers[y] = p + img->pitch*y;
} }
png_read_image( png, row_pointers ); png_read_image( png, row_pointers );
png_read_end( png, info_ptr ); png_read_end( png, info_ptr );
png_destroy_read_struct( &png, &info_ptr, png_infopp_NULL ); png_destroy_read_struct( &png, &info_ptr, png_infopp_NULL );
return surf; return img;
} }