diff -u fim-0.3-beta-prerelease/debian/control fim-0.3-beta-prerelease/debian/control --- fim-0.3-beta-prerelease/debian/control +++ fim-0.3-beta-prerelease/debian/control @@ -2,7 +2,7 @@ Section: graphics Priority: extra Maintainer: Michele Martone -Build-Depends: debhelper (>= 7), flex, bison, autotools-dev, libaa1-dev, libdjvulibre-dev, libgif-dev, libjpeg62-dev, libpng12-dev, libreadline-dev (>= 6.0), libtiff4-dev +Build-Depends: debhelper (>= 7), flex, bison, autotools-dev, libaa1-dev, libdjvulibre-dev, libgif-dev, libjpeg62-dev, libpng12-dev | libpng-dev, libreadline-dev (>= 6.0), libtiff4-dev Standards-Version: 3.8.2 Homepage: http://savannah.nongnu.org/projects/fbi-improved/ diff -u fim-0.3-beta-prerelease/debian/changelog fim-0.3-beta-prerelease/debian/changelog --- fim-0.3-beta-prerelease/debian/changelog +++ fim-0.3-beta-prerelease/debian/changelog @@ -1,3 +1,9 @@ +fim (0.3-beta-prerelease-1.3) unstable; urgency=low + + * Non-maintainer upload. + * libpng 1.5 transiton. + -- Nobuhiro Iwamatsu Sun, 07 Aug 2011 14:02:51 +0900 + fim (0.3-beta-prerelease-1.2) unstable; urgency=high * Updated to svn revision 273 diff -u fim-0.3-beta-prerelease/src/FbiStuffPng.cpp fim-0.3-beta-prerelease/src/FbiStuffPng.cpp --- fim-0.3-beta-prerelease/src/FbiStuffPng.cpp +++ fim-0.3-beta-prerelease/src/FbiStuffPng.cpp @@ -109,7 +109,11 @@ if (h->color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(h->png); if (h->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(h->png); +#else png_set_gray_1_2_4_to_8(h->png); +#endif if (png_get_bKGD(h->png, h->info, &file_bg)) { png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);