gimp-studio/libpng-1.4.patch

   1 diff -Naur gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c gimp-2.7.0/plug-ins/file-ico/ico-load.c
   2 --- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c        2010-01-18 19:01:46.000000000 -0500
   3 +++ gimp-2.7.0/plug-ins/file-ico/ico-load.c     2010-01-18 19:14:43.000000000 -0500
   4 @@ -286,14 +286,22 @@
   5    switch (color_type)
   6      {
   7      case PNG_COLOR_TYPE_GRAY:
   8 +#if PNG_LIBPNG_VER < 10400
   9        png_set_gray_1_2_4_to_8 (png_ptr);
  10 +#else
  11 +      png_set_expand_gray_1_2_4_to_8(png_ptr);
  12 +#endif
  13        if ( bit_depth == 16 )
  14          png_set_strip_16 (png_ptr);
  15        png_set_gray_to_rgb (png_ptr);
  16        png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
  17        break;
  18      case PNG_COLOR_TYPE_GRAY_ALPHA:
  19 +#if PNG_LIBPNG_VER < 10400
  20        png_set_gray_1_2_4_to_8 (png_ptr);
  21 +#else
  22 +      png_set_expand_gray_1_2_4_to_8(png_ptr);
  23 +#endif
  24        if ( bit_depth == 16 )
  25          png_set_strip_16 (png_ptr);
  26        png_set_gray_to_rgb (png_ptr);