<div dir="ltr">Hi Tobias,<div><br></div><div>thank you for the patch!<br></div><div><br></div><div>Please cancel NMU-upload, because I integrated your patch</div><div>into the version 1.1.9c-13 and uploaded it.</div><div><br></div><div>Best regards</div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature"><br>Anton</div></div>
<br><div class="gmail_quote">2016-04-08 16:24 GMT+02:00 Tobias Frost <span dir="ltr"><<a href="mailto:tobi@debian.org" target="_blank">tobi@debian.org</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Control: tags 820439 + patch<br>
Control: tags 820439 + pending<br>
<br>
Dear maintainer,<br>
<br>
I've prepared an NMU for imview (versioned as 1.1.9c-12.1) and<br>
uploaded it to DELAYED/5. Please feel free to tell me if I<br>
should delay it longer.<br>
<br>
Regards.<br>
diff -Nru imview-1.1.9c/debian/changelog imview-1.1.9c/debian/changelog<br>
--- imview-1.1.9c/debian/changelog 2013-05-07 21:00:45.000000000 +0200<br>
+++ imview-1.1.9c/debian/changelog 2016-04-08 16:23:52.000000000 +0200<br>
@@ -1,3 +1,10 @@<br>
+imview (1.1.9c-12.1) unstable; urgency=medium<br>
+<br>
+ * Non-maintainer upload.<br>
+ * Fix for libpng1.6 (Closes: #820439)<br>
+<br>
+ -- Tobias Frost <<a href="mailto:tobi@debian.org">tobi@debian.org</a>> Fri, 08 Apr 2016 16:23:52 +0200<br>
+<br>
imview (1.1.9c-12) unstable; urgency=low<br>
<br>
[ Sebastian Ramacher ]<br>
diff -Nru imview-1.1.9c/debian/patches/08_fix_libpng16.patch imview-1.1.9c/debian/patches/08_fix_libpng16.patch<br>
--- imview-1.1.9c/debian/patches/08_fix_libpng16.patch 1970-01-01 01:00:00.000000000 +0100<br>
+++ imview-1.1.9c/debian/patches/08_fix_libpng16.patch 2016-04-08 16:23:37.000000000 +0200<br>
@@ -0,0 +1,80 @@<br>
+Description: Patch for libpng1.6<br>
+ libpng1.6 removed direct access of its member functions.<br>
+Author: Tobias Frost <<a href="mailto:tobi@debian.org">tobi@debian.org</a>><br>
+Bug-Debian: <a href="https://bugs.debian.org/820439" rel="noreferrer" target="_blank">https://bugs.debian.org/820439</a><br>
+Forwarded: no<br>
+Last-Update: 2016-04-08<br>
+---<br>
+This patch header follows DEP-3: <a href="http://dep.debian.net/deps/dep3/" rel="noreferrer" target="_blank">http://dep.debian.net/deps/dep3/</a><br>
+--- a/io/readpng.cxx<br>
++++ b/io/readpng.cxx<br>
+@@ -96,7 +96,7 @@<br>
+ pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);<br>
+ info = png_create_info_struct(pp);<br>
+<br>
+- if (setjmp(pp->jmpbuf))<br>
++ if (setjmp(png_jmpbuf(pp)))<br>
+ {<br>
+ errprintf("PNG file \"%s\" contains errors!\n", pngfilename);<br>
+ return 103;<br>
+@@ -108,28 +108,40 @@<br>
+ // Get the image dimensions and convert to grayscale or RGB...<br>
+ png_read_info(pp, info);<br>
+<br>
+- if (info->color_type == PNG_COLOR_TYPE_PALETTE)<br>
++ png_uint_32 width;<br>
++ png_uint_32 height;<br>
++ int bit_depth;<br>
++ int color_type;<br>
++ int interlace_type;<br>
++ int compression_type;<br>
++ int filter_method;<br>
++<br>
++ png_get_IHDR(pp, info, &width, &height,<br>
++ &bit_depth, &color_type, &interlace_type,<br>
++ &compression_type, &filter_method);<br>
++<br>
++ if (color_type == PNG_COLOR_TYPE_PALETTE)<br>
+ png_set_expand(pp);<br>
+<br>
+- if (info->color_type & PNG_COLOR_MASK_COLOR)<br>
++ if (color_type & PNG_COLOR_MASK_COLOR)<br>
+ channels = 3;<br>
+ else<br>
+ channels = 1;<br>
+<br>
+- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)<br>
++ if ((color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)<br>
+ channels ++;<br>
+<br>
+- w = (int)(info->width);<br>
+- h = (int)(info->height);<br>
++ w = (int)(width);<br>
++ h = (int)(height);<br>
+ d = channels;<br>
+<br>
+- if (info->bit_depth < 8)<br>
++ if (bit_depth < 8)<br>
+ {<br>
+ png_set_packing(pp);<br>
+ png_set_expand(pp);<br>
+ }<br>
+ // we ought to read the 16-bit data correctly, since we can !<br>
+- else if (info->bit_depth == 16)<br>
++ else if (bit_depth == 16)<br>
+ png_set_strip_16(pp);<br>
+<br>
+ # if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)<br>
+--- a/io/readpng.cxx<br>
++++ b/io/readpng.cxx<br>
+@@ -128,7 +128,9 @@<br>
+ else<br>
+ channels = 1;<br>
+<br>
+- if ((color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)<br>
++ int num_trans;<br>
++ png_get_tRNS(pp, info, NULL, &num_trans, NULL);<br>
++ if ((color_type & PNG_COLOR_MASK_ALPHA) || num_trans)<br>
+ channels ++;<br>
+<br>
+ w = (int)(width);<br>
diff -Nru imview-1.1.9c/debian/patches/series imview-1.1.9c/debian/patches/series<br>
--- imview-1.1.9c/debian/patches/series 2013-05-07 20:20:40.000000000 +0200<br>
+++ imview-1.1.9c/debian/patches/series 2016-04-08 15:45:09.000000000 +0200<br>
@@ -5,3 +5,4 @@<br>
05_fix_dangerous_use_of_strncpy.patch<br>
06_fix_format_not_a_string.patch<br>
07_fix_kfreebsd_FTBFS.patch<br>
+08_fix_libpng16.patch<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
debian-science-maintainers mailing list<br>
<a href="mailto:debian-science-maintainers@lists.alioth.debian.org">debian-science-maintainers@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers" rel="noreferrer" target="_blank">http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers</a><br>
</font></span></blockquote></div><br></div>