packages: libmatchbox/libmatchbox-libpng15.patch (NEW)=?UTF-8?Q?=20?=- libpng-1.5 fixes

[adamg]

Author: adamg                        Date: Mon Feb 13 19:33:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libpng-1.5 fixes

---- Files affected:
packages/libmatchbox:
   libmatchbox-libpng15.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libmatchbox/libmatchbox-libpng15.patch
diff -u /dev/null packages/libmatchbox/libmatchbox-libpng15.patch:1.1
--- /dev/null	Mon Feb 13 20:33:35 2012
+++ packages/libmatchbox/libmatchbox-libpng15.patch	Mon Feb 13 20:33:30 2012
@@ -0,0 +1,22 @@
+--- libmatchbox-1.9/libmb/mbpixbuf.c~	2012-02-12 18:34:52.776056533 +0100
++++ libmatchbox-1.9/libmb/mbpixbuf.c	2012-02-12 18:35:53.839666279 +0100
+@@ -247,7 +247,7 @@
+     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 @@
+       ( 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
================================================================