blob: 8f7963d23211d03a766f49a9ed88bef96635a72a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
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
--- 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 -0500
@@ -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);
|
