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

simplify OpenRWops, fix error handling

Browse Source
This commit is contained in:
Glenn Maynard
2004-05-18 19:19:27 +00:00
parent 476774ff63
commit abcbddcaa3
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurface_Load.cpp
+8 -7
View File
@@ -4,6 +4,7 @@
#include "RageSurface_Load_JPEG.h"
#include "RageSurface_Load_GIF.h"
#include "RageUtil.h"
#include "RageFile.h"
SDL_Surface *RageSurface::LoadFile( const CString &sPath )
{
@@ -19,17 +20,17 @@ SDL_Surface *RageSurface::LoadFile( const CString &sPath )
ret = RageSurface_Load_JPEG( sPath, error );
else if( !ext.CompareNoCase("bmp") )
{
SDL_RWops *rw = OpenRWops( sPath, false );
if( rw == NULL )
RageFile f;
if( !f.Open(sPath) )
{
/* XXX */
SDL_SetError( "fail" );
SDL_SetError( "%s", f.GetError() );
return NULL;
}
ret = SDL_LoadBMP_RW( rw, false );
SDL_RWclose( rw );
SDL_FreeRW( rw );
SDL_RWops rw;
OpenRWops( &rw, &f );
ret = SDL_LoadBMP_RW( &rw, false );
SDL_RWclose( &rw );
if( ret )
mySDL_FixupPalettedAlpha( ret );