ubergames
/
gtkradiant
mirror of https://github.com/UberGames/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This is fix for failure of compilation on new libpng

This commit is contained in:
alex8664 2012-03-31 17:31:50 +04:00
parent 686a211fc3
commit 67411cb18e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/quake3/q3map2/image.c
View File

@ -123,12 +123,11 @@ void PNGReadData( png_struct *png, png_byte *buffer, png_size_t size ){
static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, int *height ){ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, int *height ){
png_struct *png; png_struct *png;
png_info *info, *end; png_info *info, *end;
pngBuffer_t pb; pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png );
int i, bitDepth, colorType, channels; int i, bitDepth, colorType, channels;
png_uint_32 w, h; png_uint_32 w, h;
byte **rowPointers; byte **rowPointers;
/* dummy check */ /* dummy check */
if ( buffer == NULL || size <= 0 || pixels == NULL || width == NULL || height == NULL ) { if ( buffer == NULL || size <= 0 || pixels == NULL || width == NULL || height == NULL ) {
return; return;
@ -167,14 +166,14 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in
} }
/* set read callback */ /* set read callback */
pb.buffer = buffer; pb->buffer = buffer;
pb.size = size; pb->size = size;
pb.offset = 0; pb->offset = 0;
png_set_read_fn( png, &pb, PNGReadData ); png_set_read_fn( png, &pb, PNGReadData );
png->io_ptr = &pb; /* hack! */ //png->io_ptr = &pb; /* hack! */
/* set error longjmp */ /* set error longjmp */
if ( setjmp( png->jmpbuf ) ) { if ( setjmp( png_jmpbuf(png) ) ) {
Sys_Printf( "WARNING: An error occurred reading PNG image\n" ); Sys_Printf( "WARNING: An error occurred reading PNG image\n" );
png_destroy_read_struct( &png, &info, &end ); png_destroy_read_struct( &png, &info, &end );
return; return;