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

Merge remote-tracking branch 'ttimo/master'

Browse Source 
Conflicts:
	plugins/imagepng/plugin.cpp
	radiant/gtkdlgs.cpp
	radiant/radiant.ico
	tools/quake3/q3map2/image.c
This commit is contained in:
Rudolf Polzer
2012-04-12 15:32:57 +02:00
parent 54a0010018 ea08af07fe
commit 62d99f889c
134 changed files with 52050 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/imagepng/plugin.cpp
View File

@@ -39,7 +39,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 ){
globalErrorStream() << "libpng error: " << error_msg << "\n";
longjmp( png_jmpbuf( png_ptr ), 0 );
longjmp( png_jmpbuf(png_ptr), 0 );
}
void user_read_data( png_structp png_ptr, png_bytep data, png_uint_32 length ){
@@ -84,7 +84,7 @@ Image* LoadPNGBuff( unsigned char* fbuffer ){
// configure the read function
png_set_read_fn( png_ptr, ( png_voidp ) & p_fbuffer, ( png_rw_ptr ) & user_read_data );
if ( setjmp( png_jmpbuf( png_ptr ) ) ) {
if ( setjmp( png_jmpbuf(png_ptr) ) ) {
png_destroy_read_struct( &png_ptr, &info_ptr,
&end_info );
return 0;