quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try making it work with newer libpng

Browse Source
This commit is contained in:
Rudolf Polzer 2010-02-05 12:34:56 +01:00
parent 32dcbf7747
commit c1b0348878
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/imagepng/plugin.cpp
View File

@ -41,7 +41,7 @@ void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg)
void user_error_fn(png_structp png_ptr, png_const_charp error_msg) void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
{ {
globalErrorStream() << "libpng error: " << error_msg << "\n"; globalErrorStream() << "libpng error: " << error_msg << "\n";
longjmp(png_ptr->jmpbuf, 0); longjmp(png_jmpbuf(png_ptr), 0);
} }
void user_read_data(png_structp png_ptr, png_bytep data, png_uint_32 length) void user_read_data(png_structp png_ptr, png_bytep data, png_uint_32 length)
@ -89,7 +89,7 @@ Image* LoadPNGBuff (unsigned char* fbuffer)
// configure the read function // configure the read function
png_set_read_fn(png_ptr, (voidp)&p_fbuffer, (png_rw_ptr)&user_read_data); png_set_read_fn(png_ptr, (voidp)&p_fbuffer, (png_rw_ptr)&user_read_data);
if (setjmp(png_ptr->jmpbuf)) { if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, png_destroy_read_struct(&png_ptr, &info_ptr,
&end_info); &end_info);
return 0; return 0;
@ -108,7 +108,7 @@ Image* LoadPNGBuff (unsigned char* fbuffer)
png_set_palette_to_rgb(png_ptr); png_set_palette_to_rgb(png_ptr);
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
png_set_gray_1_2_4_to_8(png_ptr); png_set_expand_gray_1_2_4_to_8(png_ptr);
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png_ptr); png_set_tRNS_to_alpha(png_ptr);
@ -153,7 +153,7 @@ Image* LoadPNGBuff (unsigned char* fbuffer)
png_read_end(png_ptr, info_ptr); png_read_end(png_ptr, info_ptr);
/* free up the memory structure */ /* free up the memory structure */
png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
free(row_pointers); free(row_pointers);