mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 08:36:41 +01:00
32 lines
987 B
Diff
32 lines
987 B
Diff
|
Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649554
|
||
|
|
--- devil-1.7.8.orig/src-IL/src/il_icon.c
|
||
|
|
+++ devil-1.7.8/src-IL/src/il_icon.c
|
||
|
|
@@ -525,7 +525,11 @@
|
||
|
|
|
||
|
|
// Expand low-bit-depth grayscale images to 8 bits
|
||
|
|
if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
|
||
|
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||
|
|
+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
|
||
|
|
+#else
|
||
|
|
png_set_gray_1_2_4_to_8(ico_png_ptr);
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
// Expand RGB images with transparency to full alpha channels
|
||
|
|
only in patch2:
|
||
|
|
unchanged:
|
||
|
|
--- devil-1.7.8.orig/src-IL/src/il_png.c
|
||
|
|
+++ devil-1.7.8/src-IL/src/il_png.c
|
||
|
|
@@ -278,7 +278,11 @@
|
||
|
|
|
||
|
|
// Expand low-bit-depth grayscale images to 8 bits
|
||
|
|
if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
|
||
|
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||
|
|
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
|
||
|
|
+#else
|
||
|
|
png_set_gray_1_2_4_to_8(png_ptr);
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
// Expand RGB images with transparency to full alpha channels
|