- fixes build with libpng 1.4

[packages/DirectFB.git] / DirectFB-libpng.patch

diff -urN DirectFB-1.2.7/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c DirectFB-1.2.7.new/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
--- DirectFB-1.2.7/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2009-01-20 13:50:58.000000000 +0100
+++ DirectFB-1.2.7.new/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2010-01-28 19:25:39.434186166 +0100
@@ -168,7 +168,7 @@
 static DFBResult
 Probe( IDirectFBImageProvider_ProbeContext *ctx )
 {
-     if (png_check_sig( ctx->header, 8 ))
+     if (png_sig_cmp( ctx->header, 0, 8 ) == 0)
           return DFB_OK;
 
      return DFB_UNSUPPORTED;
@@ -636,7 +636,7 @@
           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
                u32        key;
                png_colorp palette    = data->info_ptr->palette;
-               png_bytep  trans      = data->info_ptr->trans;
+               png_bytep  trans      = data->info_ptr->trans_alpha;
                int        num_colors = MIN( MAXCOLORMAPSIZE,
                                             data->info_ptr->num_palette );
                u8         cmap[3][num_colors];
@@ -661,7 +661,7 @@
           }
           else {
                /* ...or based on trans rgb value */
-               png_color_16p trans = &data->info_ptr->trans_values;
+               png_color_16p trans = &data->info_ptr->trans_color;
 
                data->color_key = (((trans->red & 0xff00) << 8) |
                                   ((trans->green & 0xff00)) |
@@ -672,7 +672,7 @@
      switch (data->color_type) {
           case PNG_COLOR_TYPE_PALETTE: {
                png_colorp palette    = data->info_ptr->palette;
-               png_bytep  trans      = data->info_ptr->trans;
+               png_bytep  trans      = data->info_ptr->trans_alpha;
                int        num_trans  = data->info_ptr->num_trans;
                int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );