casa-mp-base

Fix build with libpng 1.5.

https://bugzilla.xamarin.com/show_bug.cgi?id=1632

--- src/pngcodec.c.orig 2010-11-03 16:52:54.000000000 +0000

+++ src/pngcodec.c

@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn

    bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);

    bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);

 #elif defined(PNG_pHYs_SUPPORTED)

-   if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {

-       bitmap_data->image_flags |= ImageFlagsHasRealDPI;

-       bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;

-       bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;

+   if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {

+       png_uint_32 res_x, res_y;

+       int unit_type;

+       png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type);

+       if (unit_type == PNG_RESOLUTION_METER) {

+           bitmap_data->image_flags |= ImageFlagsHasRealDPI;

+           bitmap_data->dpi_horz = res_x * 0.0254;

+           bitmap_data->dpi_vert = res_y * 0.0254;

+       }

    }

 #endif

    /* default to screen resolution (if nothing was provided or available) */

@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn

 #if defined(PNG_iCCP_SUPPORTED)

    {

        png_charp   name;

-       png_charp   profile;

+       png_bytep   profile;

        png_uint_32 proflen;

        int     compression_type;

@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream 

        ImageFlags  colourspace_flag;

        int     i;

        int     j;

+       png_colorp  png_palette;

+       int     png_num_palette;

+       png_bytep   trans_alpha;

+       int     num_trans;

+       png_color_16p   trans_color;

        width = png_get_image_width (png_ptr, info_ptr);

        height = png_get_image_height (png_ptr, info_ptr);

@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream 

        }

        /* Copy palette. */

+       png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);

+

        num_colours = 1 << bit_depth;

        if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {

@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream 

            colourspace_flag = ImageFlagsColorSpaceRGB;

            palette_entries = num_colours;

-           if (palette_entries > info_ptr->num_palette) {

-               palette_entries = info_ptr->num_palette;

+           if (palette_entries > png_num_palette) {

+               palette_entries = png_num_palette;

            }