[gimp] Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0

[Michael Natterer <mitch src gnome org>]

commit 2db98792dcb466ef432ffe15a249466609beba45
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jan 31 11:56:36 2010 +0100

    Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0
    
    Depend on the libpng version that is in debian testing (1.2.42) and
    use png_set_expand_gray_1_2_4_to_8() instead of the deprecated
    png_set_gray_1_2_4_to_8().

 configure.ac                 |    3 ++-
 plug-ins/file-ico/ico-load.c |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 35d449a..d83b1d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ m4_define([dbus_glib_required_version], [0.70])
 m4_define([libhal_required_version], [0.5.7])
 m4_define([exif_required_version], [0.6.15])
 m4_define([lcms_required_version], [1.16])
+m4_define([libpng_required_version], [1.2.42])
 
 
 AC_INIT([GIMP], [gimp_version],
@@ -1133,7 +1134,7 @@ AC_ARG_WITH(libpng,  [  --without-libpng        build without PNG support])
 have_libpng=no
 if test "x$with_libpng" != xno; then
   have_libpng=yes
-  PKG_CHECK_MODULES(PNG, libpng,
+  PKG_CHECK_MODULES(PNG, libpng >= libpng_required_version,
     FILE_PNG='file-png$(EXEEXT)',
     [have_libpng="no (libpng not found)"
      AC_MSG_ERROR([
diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
index c60f596..9c53ec6 100644
--- a/plug-ins/file-ico/ico-load.c
+++ b/plug-ins/file-ico/ico-load.c
@@ -286,14 +286,14 @@ ico_read_png (FILE    *fp,
   switch (color_type)
     {
     case PNG_COLOR_TYPE_GRAY:
-      png_set_gray_1_2_4_to_8 (png_ptr);
+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
       if ( bit_depth == 16 )
         png_set_strip_16 (png_ptr);
       png_set_gray_to_rgb (png_ptr);
       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
       break;
     case PNG_COLOR_TYPE_GRAY_ALPHA:
-      png_set_gray_1_2_4_to_8 (png_ptr);
+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
       if ( bit_depth == 16 )
         png_set_strip_16 (png_ptr);
       png_set_gray_to_rgb (png_ptr);