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

Merge pull request #966 from drewbarbs/db_fix_png_write

Browse Source 
Fix Texture Font Generator PNG write
This commit is contained in:
Jason Felds
2015-12-20 22:25:25 -05:00
parent 427628d8f5 f451cc72cd
commit 92724cd627
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurface_Save_PNG.cpp
+2 -2
View File
@@ -90,7 +90,7 @@ static bool RageSurface_Save_PNG( RageFile &f, char szErrorbuf[1024], RageSurfac
png_info *pInfo = png_create_info_struct(pPng); png_info *pInfo = png_create_info_struct(pPng);
if( pInfo == NULL ) if( pInfo == NULL )
{ {
png_destroy_read_struct( &pPng, NULL, NULL ); png_destroy_write_struct( &pPng, NULL );
if( bDeleteImg ) if( bDeleteImg )
delete pImg; delete pImg;
sprintf( szErrorbuf, "creating png_create_info_struct failed"); sprintf( szErrorbuf, "creating png_create_info_struct failed");
@@ -99,7 +99,7 @@ static bool RageSurface_Save_PNG( RageFile &f, char szErrorbuf[1024], RageSurfac
if( setjmp(png_jmpbuf(pPng)) ) if( setjmp(png_jmpbuf(pPng)) )
{ {
png_destroy_read_struct( &pPng, &pInfo, NULL ); png_destroy_write_struct( &pPng, &pInfo );
return false; return false;
} }
src/Texture Font Generator/Utils.cpp
+2 -3
View File
@@ -162,14 +162,14 @@ bool SavePNG( FILE *f, char szErrorbuf[1024], const Surface *pSurf )
png_info *pInfo = png_create_info_struct(pPng); png_info *pInfo = png_create_info_struct(pPng);
if( pInfo == NULL ) if( pInfo == NULL )
{ {
png_destroy_read_struct( &pPng, NULL, NULL ); png_destroy_write_struct( &pPng, NULL );
sprintf( szErrorbuf, "creating png_create_info_struct failed"); sprintf( szErrorbuf, "creating png_create_info_struct failed");
return false; return false;
} }
if( setjmp(png_jmpbuf(pPng)) ) if( setjmp(png_jmpbuf(pPng)) )
{ {
png_destroy_read_struct( &pPng, &pInfo, NULL ); png_destroy_write_struct( &pPng, &pInfo );
return false; return false;
} }
@@ -180,7 +180,6 @@ bool SavePNG( FILE *f, char szErrorbuf[1024], const Surface *pSurf )
PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE ); PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE );
png_write_info( pPng, pInfo ); png_write_info( pPng, pInfo );
png_set_filler( pPng, 0, PNG_FILLER_AFTER );
png_byte *pixels = (png_byte *) pSurf->pRGBA; png_byte *pixels = (png_byte *) pSurf->pRGBA;
for( int y = 0; y < pSurf->iHeight; y++ ) for( int y = 0; y < pSurf->iHeight; y++ )