24 lines
934 B
Diff
24 lines
934 B
Diff
diff -up libmatchbox-1.9/libmb/mbpixbuf.c.jx libmatchbox-1.9/libmb/mbpixbuf.c
|
|
--- libmatchbox-1.9/libmb/mbpixbuf.c.jx 2006-07-26 15:12:25.000000000 -0400
|
|
+++ libmatchbox-1.9/libmb/mbpixbuf.c 2011-11-17 18:28:51.981001505 -0500
|
|
@@ -247,7 +247,7 @@ _load_png_file( const char *file,
|
|
return NULL;
|
|
}
|
|
|
|
- if ( setjmp( png_ptr->jmpbuf ) ) {
|
|
+ if ( setjmp( png_jmpbuf(png_ptr) ) ) {
|
|
png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
|
|
fclose(fd);
|
|
return NULL;
|
|
@@ -269,8 +269,8 @@ _load_png_file( const char *file,
|
|
( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
|
|
png_set_gray_to_rgb(png_ptr);
|
|
|
|
- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA
|
|
- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
|
|
+ if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA
|
|
+ || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA
|
|
)
|
|
*has_alpha = 1;
|
|
else
|