projects / packages / DevIL.git / blame
| Commit | Line | Data |
|---|---|---|
| 5921fce3 SS |
1 | --- DevIL-1.7.2/src-IL/src/il_png.c.orig 2010-02-07 16:59:29.208824733 +0100 |
| 2 | +++ DevIL-1.7.2/src-IL/src/il_png.c 2010-02-07 17:04:17.675411333 +0100 | |
| 3 | @@ -103,7 +103,11 @@ ILboolean iIsValidPng() | |
| 4 | Read = iread(Signature, 1, 8); | |
| 5 | iseek(-Read, IL_SEEK_CUR); | |
| 6 | ||
| 7 | +#if PNG_LIBPNG_VER < 10400 | |
| 8 | return png_check_sig(Signature, 8); | |
| 9 | +#else | |
| 10 | + return png_sig_cmp(Signature, 0, 8) == 0; | |
| 11 | +#endif | |
| 12 | } | |
| 13 | ||
| 14 | ||
| 15 | @@ -278,7 +282,11 @@ ILboolean readpng_get_image(ILdouble dis | |
| 16 | ||
| 17 | // Expand low-bit-depth grayscale images to 8 bits | |
| 18 | if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { | |
| 19 | +#if PNG_LIBPNG_VER < 10400 | |
| 20 | png_set_gray_1_2_4_to_8(png_ptr); | |
| 21 | +#else | |
| 22 | + png_set_expand_gray_1_2_4_to_8(png_ptr); | |
| 23 | +#endif | |
| 24 | } | |
| 25 | ||
| 26 | // Expand RGB images with transparency to full alpha channels | |
| 27 | --- DevIL-1.7.2/src-IL/src/il_icon.c.orig 2010-02-07 17:15:17.456176881 +0100 | |
| 28 | +++ DevIL-1.7.2/src-IL/src/il_icon.c 2010-02-07 17:15:59.942840566 +0100 | |
| 29 | @@ -530,7 +530,11 @@ | |
| 30 | ||
| 31 | // Expand low-bit-depth grayscale images to 8 bits | |
| 32 | if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { | |
| 33 | +#if PNG_LIBPNG_VER < 10400 | |
| 34 | png_set_gray_1_2_4_to_8(ico_png_ptr); | |
| 35 | +#else | |
| 36 | + png_set_expand_gray_1_2_4_to_8(ico_png_ptr); | |
| 37 | +#endif | |
| 38 | } | |
| 39 | ||
| 40 | // Expand RGB images with transparency to full alpha channels |