1*4882a593SmuzhiyunSupport for libpng 1.5+ shamelessly taken from Gentoo. 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunSigned-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 4*4882a593Smuzhiyun 5*4882a593Smuzhiyun--- a/libmb/mbpixbuf.c 6*4882a593Smuzhiyun+++ b/libmb/mbpixbuf.c 7*4882a593Smuzhiyun@@ -247,7 +247,7 @@ 8*4882a593Smuzhiyun return NULL; 9*4882a593Smuzhiyun } 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun- if ( setjmp( png_ptr->jmpbuf ) ) { 12*4882a593Smuzhiyun+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { 13*4882a593Smuzhiyun png_destroy_read_struct( &png_ptr, &info_ptr, NULL); 14*4882a593Smuzhiyun fclose(fd); 15*4882a593Smuzhiyun return NULL; 16*4882a593Smuzhiyun@@ -269,8 +269,8 @@ 17*4882a593Smuzhiyun ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) 18*4882a593Smuzhiyun png_set_gray_to_rgb(png_ptr); 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 21*4882a593Smuzhiyun- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA 22*4882a593Smuzhiyun+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA 23*4882a593Smuzhiyun+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA 24*4882a593Smuzhiyun ) 25*4882a593Smuzhiyun *has_alpha = 1; 26*4882a593Smuzhiyun else 27