Nobuhiro Iwamatsu wrote:
> I uploaded libpng 1.5.2 to experimental.
> libpng maintainers plan to transition from libpng 1.2 to 1.5.
> I am checking build it the package depend to libpng.
>
> I noticed your package FTBFS by libpng 1.5.
> I created the patch that revise this problem.
> Could you check and apply this patch?
Hi Nobuhiro,
thanks for filing the report. But I'm wondering, whether the
patch is actually correct:
> +@@ -68,8 +68,11 @@ png_init(FILE *fp, char *filename, unsig
> + png_set_strip_16(h->png);
> + 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);
You're removing the "if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)"
test, but I suppose this should rather be:
----
@@ -69,7 +69,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);
----
Cheers,
Moritz
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
