projects / packages / gimp.git / blame
| Commit | Line | Data |
|---|---|---|
| 13631004 MB |
1 | --- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 |
| 2 | +++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 | |
| 3 | @@ -286,14 +286,22 @@ | |
| 4 | switch (color_type) | |
| 5 | { | |
| 6 | case PNG_COLOR_TYPE_GRAY: | |
| 7 | +#if PNG_LIBPNG_VER < 10400 | |
| 8 | png_set_gray_1_2_4_to_8 (png_ptr); | |
| 9 | +#else | |
| 10 | + png_set_expand_gray_1_2_4_to_8(png_ptr); | |
| 11 | +#endif | |
| 12 | if ( bit_depth == 16 ) | |
| 13 | png_set_strip_16 (png_ptr); | |
| 14 | png_set_gray_to_rgb (png_ptr); | |
| 15 | png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); | |
| 16 | break; | |
| 17 | case PNG_COLOR_TYPE_GRAY_ALPHA: | |
| 18 | +#if PNG_LIBPNG_VER < 10400 | |
| 19 | png_set_gray_1_2_4_to_8 (png_ptr); | |
| 20 | +#else | |
| 21 | + png_set_expand_gray_1_2_4_to_8(png_ptr); | |
| 22 | +#endif | |
| 23 | if ( bit_depth == 16 ) | |
| 24 | png_set_strip_16 (png_ptr); | |
| 25 | png_set_gray_to_rgb (png_ptr); |