Mercurial > mxe-octave

comparison src/devil-png.patch @ 674:ba1c85647fc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compatibility patch to libpng-1.4 for package devil
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 01 Feb 2010 16:13:17 +0100
parents
children 29f1ba4559ae
comparison
equal deleted inserted replaced
673:cd4bb34b43a2 674:ba1c85647fc1
1 This file is part of mingw-cross-env.
2 See doc/index.html or doc/README for further information.
3
4 diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
5 --- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 08:10:09.000000000 +0100
6 +++ devil-1.7.8/src-IL/src/il_icon.c 2010-02-01 16:01:37.000000000 +0100
7 @@ -525,7 +525,7 @@
8
9 // Expand low-bit-depth grayscale images to 8 bits
10 if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
11 - png_set_gray_1_2_4_to_8(ico_png_ptr);
12 + png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
13 }
14
15 // Expand RGB images with transparency to full alpha channels
16 diff -urN devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
17 --- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 08:10:09.000000000 +0100
18 +++ devil-1.7.8/src-IL/src/il_png.c 2010-02-01 15:58:41.000000000 +0100
19 @@ -105,7 +105,7 @@
20 Read = iread(Signature, 1, 8);
21 iseek(-Read, IL_SEEK_CUR);
22
23 - return png_check_sig(Signature, 8);
24 + return !png_sig_cmp(Signature, 0, 8);
25 }
26
27
28 @@ -278,7 +278,7 @@
29
30 // Expand low-bit-depth grayscale images to 8 bits
31 if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
32 - png_set_gray_1_2_4_to_8(png_ptr);
33 + png_set_expand_gray_1_2_4_to_8(png_ptr);
34 }
35
36 // Expand RGB images with transparency to full alpha channels