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

LoadFile( bHeaderOnly ): only load image dimensions

Browse Source 
caching TM4: 37 secs -> 28 secs
only implemented for PNG; 90% of song images are PNG anyway
This commit is contained in:
Glenn Maynard
2004-05-19 05:10:23 +00:00
parent 792cecd972
commit 703ebfca58
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurface_Load_PNG.cpp
+21 -5
View File
@@ -52,7 +52,7 @@ static void PNG_Warning( png_struct *png, const char *warning )
/* Since libpng forces us to use longjmp (gross!), this function shouldn't create any C++
* objects, and needs to watch out for memleaks. */
static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char errorbuf[1024] )
static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char errorbuf[1024], bool bHeaderOnly )
{
error_info error;
error.err = errorbuf;
@@ -76,7 +76,7 @@ static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
SDL_Surface *volatile img = NULL;
if( setjmp(png_jmpbuf(png)) )
{
png_destroy_read_struct( &png, &info_ptr, png_infopp_NULL );
png_destroy_read_struct( &png, &info_ptr, NULL );
if( img )
SDL_FreeSurface( img );
return NULL;
@@ -90,6 +90,22 @@ static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
int bit_depth, color_type;
png_get_IHDR( png, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL );
/* If bHeaderOnly is true, don't allocate the pixel storage space or decompress
* the image. Just return an empty surface with only the width and height set. */
if( bHeaderOnly )
{
img = SDL_CreateRGBSurfaceFrom( SDL_SWSURFACE, width, height, 32, 0, 0, 0, 0, NULL );
png_destroy_read_struct( &png, &info_ptr, NULL );
if( !img )
{
strcpy( errorbuf, SDL_GetError() );
return NULL;
}
return img;
}
png_set_strip_16(png); /* 16bit->8bit */
png_set_packing( png ); /* 1,2,4 bit->8 bit */
@@ -206,13 +222,13 @@ static SDL_Surface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
png_read_row( png, pixels + img->pitch*y, NULL );
png_read_end( png, info_ptr );
png_destroy_read_struct( &png, &info_ptr, png_infopp_NULL );
png_destroy_read_struct( &png, &info_ptr, NULL );
return img;
}
SDL_Surface *RageSurface_Load_PNG( const CString &sPath, CString &error )
SDL_Surface *RageSurface_Load_PNG( const CString &sPath, bool bHeaderOnly, CString &error )
{
RageFile f;
if( !f.Open( sPath ) )
@@ -222,7 +238,7 @@ SDL_Surface *RageSurface_Load_PNG( const CString &sPath, CString &error )
}
char errorbuf[1024];
SDL_Surface *ret = RageSurface_Load_PNG( &f, sPath, errorbuf );
SDL_Surface *ret = RageSurface_Load_PNG( &f, sPath, errorbuf, bHeaderOnly );
if( ret == NULL )
{
error = errorbuf;