From 136310044a952aacc2cafc9796782f31cd52def9 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Thu, 28 Jan 2010 17:54:09 +0000 Subject: [PATCH] - fixes for libpng 1.4 (patch from Arch Linux) Changed files: gimp-libpng.patch -> 1.1 --- gimp-libpng.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 gimp-libpng.patch diff --git a/gimp-libpng.patch b/gimp-libpng.patch new file mode 100644 index 0000000..ee65a69 --- /dev/null +++ b/gimp-libpng.patch @@ -0,0 +1,25 @@ +--- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 ++++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 +@@ -286,14 +286,22 @@ + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + 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: ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); \ No newline at end of file -- 2.44.0