Mercurial > mxe-octave
view src/devil-1-png.patch @ 2661:3567da505594
json-c update to version 0.10, using github downloads.
Squashed commit of the following:
commit a93e1e80e4a6b668009bd024923e387f71eff7a3
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 23:16:59 2012 +0200
Patches for:
- missing file
- remove check for rpl_* functions
commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 19:08:40 2012 +0200
Fixed indentation
commit 78b51e08e5174454495b8df547c4bccdc06bef73
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 01:13:08 2012 +0200
json-c compiles correctly (finally).
commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab
Author: Thomas Mayer <thomas@residuum.org>
Date: Fri Jul 13 22:16:41 2012 +0200
Changes to json-c files according to current MXE standards.
commit a533fe5439d56de76c2d3b9d634c597cba94ff52
Author: Thomas Mayer <thomas@residuum.org>
Date: Thu Jul 12 22:27:54 2012 +0200
Update to json-c 0.10, and use github repository.
| author | Thomas Mayer <thomas@residuum.org> |
|---|---|
| date | Tue, 17 Jul 2012 23:18:18 +0200 |
| parents | 99516e73b368 |
| children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c --- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 08:10:09.000000000 +0100 +++ devil-1.7.8/src-IL/src/il_icon.c 2010-02-01 16:01:37.000000000 +0100 @@ -525,7 +525,7 @@ // Expand low-bit-depth grayscale images to 8 bits if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_gray_1_2_4_to_8(ico_png_ptr); + png_set_expand_gray_1_2_4_to_8(ico_png_ptr); } // Expand RGB images with transparency to full alpha channels diff -urN devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c --- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 08:10:09.000000000 +0100 +++ devil-1.7.8/src-IL/src/il_png.c 2010-02-01 15:58:41.000000000 +0100 @@ -105,7 +105,7 @@ Read = iread(Signature, 1, 8); iseek(-Read, IL_SEEK_CUR); - return png_check_sig(Signature, 8); + return !png_sig_cmp(Signature, 0, 8); } @@ -278,7 +278,7 @@ // Expand low-bit-depth grayscale images to 8 bits if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); } // Expand RGB images with transparency to full alpha channels