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

libpng 1.4 compatibility patch.

Browse Source
This commit is contained in:
Nicole Reid
2010-04-17 01:07:06 -04:00
parent b208a70cb7
commit 1c494f6dd2
2 changed files with 486 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurface_Load_PNG.cpp
+6 -6
View File
@@ -30,7 +30,7 @@ namespace
void RageFile_png_read( png_struct *png, png_byte *p, png_size_t size )
{
CHECKPOINT;
RageFile *f = (RageFile *) png->io_ptr;
RageFile *f = (RageFile *) png_get_io_ptr(png);
int got = f->Read( p, size );
if( got == -1 )
@@ -56,17 +56,17 @@ struct error_info
void PNG_Error( png_struct *png, const char *error )
{
CHECKPOINT;
error_info *info = (error_info *) png->error_ptr;
error_info *info = (error_info *) png_get_error_ptr(png);
strncpy( info->err, error, 1024 );
info->err[1023] = 0;
LOG->Trace( "loading \"%s\": err: %s", info->fn, info->err );
longjmp( png->jmpbuf, 1 );
longjmp( png_jmpbuf(png), 1 );
}
void PNG_Warning( png_struct *png, const char *warning )
{
CHECKPOINT;
error_info *info = (error_info *) png->error_ptr;
error_info *info = (error_info *) png_get_io_ptr(png);
LOG->Trace( "loading \"%s\": warning: %s", info->fn, warning );
}
@@ -106,7 +106,7 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
RageSurface *volatile img = NULL;
CHECKPOINT;
if( setjmp(png->jmpbuf) )
if( setjmp(png_jmpbuf(png) ))
{
png_destroy_read_struct( &png, &info_ptr, NULL );
delete img;
@@ -140,7 +140,7 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
if( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 )
png_set_gray_1_2_4_to_8( png );
png_set_expand_gray_1_2_4_to_8( png );
/* These are set for type == PALETTE. */
RageSurfaceColor colors[256];
src/RageSurface_Save_PNG.cpp
+6 -6
View File
@@ -33,7 +33,7 @@ static void SafePngError( png_struct *pPng, const RString &sStr )
static void RageFile_png_write( png_struct *pPng, png_byte *pData, png_size_t iSize )
{
RageFile *pFile = (RageFile *) pPng->io_ptr;
RageFile *pFile = (RageFile *) png_get_io_ptr(pPng);
int iGot = pFile->Write( pData, iSize );
if( iGot == -1 )
@@ -42,7 +42,7 @@ static void RageFile_png_write( png_struct *pPng, png_byte *pData, png_size_t iS
static void RageFile_png_flush( png_struct *pPng )
{
RageFile *pFile = (RageFile *) pPng->io_ptr;
RageFile *pFile = (RageFile *) png_get_io_ptr(pPng);
int iGot = pFile->Flush();
if( iGot == -1 )
@@ -56,10 +56,10 @@ struct error_info
static void PNG_Error( png_struct *pPng, const char *szError )
{
error_info *pInfo = (error_info *) pPng->error_ptr;
error_info *pInfo = (error_info *) png_get_error_ptr(pPng);
strncpy( pInfo->szErr, szError, 1024 );
pInfo->szErr[1023] = 0;
longjmp( pPng->jmpbuf, 1 );
longjmp( png_jmpbuf(pPng), 1 );
}
static void PNG_Warning( png_struct *png, const char *warning )
@@ -101,9 +101,9 @@ static bool RageSurface_Save_PNG( RageFile &f, char szErrorbuf[1024], RageSurfac
return false;
}
if( setjmp(pPng->jmpbuf) )
if( setjmp(png_jmpbuf(pPng)) )
{
png_destroy_read_struct( &pPng, &pInfo, png_infopp_NULL );
png_destroy_read_struct( &pPng, &pInfo, NULL );
return false;
}