Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is fix for failure of compilation on new libpng
- Loading branch information
alex8664
committed
Mar 31, 2012
1 parent
686a211
commit 67411cb
Showing
1 changed file
with
6 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 ){ | ||
png_struct *png; | ||
png_info *info, *end; | ||
pngBuffer_t pb; | ||
pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png ); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
TTimo
Owner
|
||
int i, bitDepth, colorType, channels; | ||
png_uint_32 w, h; | ||
byte **rowPointers; | ||
|
||
|
||
/* dummy check */ | ||
if ( buffer == NULL || size <= 0 || pixels == NULL || width == NULL || height == NULL ) { | ||
return; | ||
|
@@ -167,14 +166,14 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in | |
} | ||
|
||
/* set read callback */ | ||
pb.buffer = buffer; | ||
pb.size = size; | ||
pb.offset = 0; | ||
pb->buffer = buffer; | ||
pb->size = size; | ||
pb->offset = 0; | ||
png_set_read_fn( png, &pb, PNGReadData ); | ||
png->io_ptr = &pb; /* hack! */ | ||
//png->io_ptr = &pb; /* hack! */ | ||
|
||
/* set error longjmp */ | ||
if ( setjmp( png->jmpbuf ) ) { | ||
if ( setjmp( png_jmpbuf(png) ) ) { | ||
Sys_Printf( "WARNING: An error occurred reading PNG image\n" ); | ||
png_destroy_read_struct( &png, &info, &end ); | ||
return; | ||
|
This cannot be right:
png
is used uninitialized here.