Bug#635745: exactimage: FTBFS with libpng 1.5.2
Oh, sorry.
I attached.
Thanks,
Nobuhiro
2011/7/28 Jakub Wilk <jwilk@debian.org>:
> I don't think your patch applies cleanly:
>
>> <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
>> <html><head>
>> <title>404 Not Found</title>
>> </head><body>
>> <h1>Not Found</h1>
>> <p>The requested URL /~iwamatsu/libpng/patches/exactimage_0.8.5-1.patch
>> was not found on this server.</p>
>> <hr>
>> <address>Apache Server at people.debian.org Port 80</address>
>> </body></html>
>
> :P
>
> --
> Jakub Wilk
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
diff -Nru exactimage-0.8.5/debian/changelog exactimage-0.8.5/debian/changelog
--- exactimage-0.8.5/debian/changelog 2011-04-30 21:30:56.000000000 +0900
+++ exactimage-0.8.5/debian/changelog 2011-05-30 13:38:35.000000000 +0900
@@ -1,3 +1,10 @@
+exactimage (0.8.5-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * libpng transition.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Mon, 30 May 2011 13:38:27 +0900
+
exactimage (0.8.5-1) unstable; urgency=low
* New upstream release.
diff -Nru exactimage-0.8.5/debian/patches/debian-changes-0.8.5-1.1 exactimage-0.8.5/debian/patches/debian-changes-0.8.5-1.1
--- exactimage-0.8.5/debian/patches/debian-changes-0.8.5-1.1 1970-01-01 09:00:00.000000000 +0900
+++ exactimage-0.8.5/debian/patches/debian-changes-0.8.5-1.1 2011-06-09 08:52:11.000000000 +0900
@@ -0,0 +1,130 @@
+Description: Upstream changes introduced in version 0.8.5-1.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ exactimage (0.8.5-1.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * libpng transition.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- exactimage-0.8.5.orig/codecs/png.cc
++++ exactimage-0.8.5/codecs/png.cc
+@@ -17,6 +17,7 @@
+
+ #include <stdlib.h>
+ #include <png.h>
++#include <zlib.h>
+
+ #include <iostream>
+
+@@ -58,7 +59,7 @@ int PNGCodec::readImage (std::istream* s
+ png_structp png_ptr;
+ png_infop info_ptr;
+ png_uint_32 width, height;
+- int bit_depth, color_type, interlace_type;
++ int bit_depth, color_type, interlace_type, num_trans;
+
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+ NULL /*user_error_ptr*/,
+@@ -71,7 +72,7 @@ int PNGCodec::readImage (std::istream* s
+ /* Allocate/initialize the memory for image information. REQUIRED. */
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL) {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return 0;
+ }
+
+@@ -82,7 +83,7 @@ int PNGCodec::readImage (std::istream* s
+
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ /* If we get here, we had a problem reading the file */
+ return 0;
+ }
+@@ -99,13 +100,13 @@ int PNGCodec::readImage (std::istream* s
+ png_read_info (png_ptr, info_ptr);
+
+ png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+- &interlace_type, int_p_NULL, int_p_NULL);
++ &interlace_type, NULL, NULL);
+
+ image.w = width;
+ image.h = height;
+ image.bps = bit_depth;
+- image.spp = info_ptr->channels;
+-
++ image.spp = png_get_channels(png_ptr, info_ptr);
++
+ png_uint_32 res_x, res_y;
+ res_x = png_get_x_pixels_per_meter(png_ptr, info_ptr);
+ res_y = png_get_y_pixels_per_meter(png_ptr, info_ptr);
+@@ -119,11 +120,13 @@ int PNGCodec::readImage (std::istream* s
+ * (not useful if you are using png_set_packing). */
+ // png_set_packswap(png_ptr);
+
++ png_get_tRNS(png_ptr, info_ptr, NULL, &num_trans, NULL);
++
+ /* Expand paletted colors into true RGB triplets */
+ if (color_type == PNG_COLOR_TYPE_PALETTE) {
+ png_set_palette_to_rgb(png_ptr);
+ image.bps = 8;
+- if (info_ptr->num_trans)
++ if (num_trans)
+ image.spp = 4;
+ else
+ image.spp = 3;
+@@ -196,11 +199,11 @@ int PNGCodec::readImage (std::istream* s
+ for (int pass = 0; pass < number_passes; ++pass)
+ for (unsigned int y = 0; y < height; ++y) {
+ row_pointers[0] = image.getRawData() + y * stride;
+- png_read_rows(png_ptr, row_pointers, png_bytepp_NULL, 1);
++ png_read_rows(png_ptr, row_pointers, NULL, 1);
+ }
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* that's it */
+ return true;
+@@ -224,7 +227,7 @@ bool PNGCodec::writeImage (std::ostream*
+ /* Allocate/initialize the memory for image information. REQUIRED. */
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL) {
+- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++ png_destroy_write_struct(&png_ptr, NULL);
+ return false;
+ }
+
+@@ -244,8 +247,10 @@ bool PNGCodec::writeImage (std::ostream*
+ else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION;
+ png_set_compression_level(png_ptr, quality);
+
++ /* Need?
+ png_info_init (info_ptr);
+-
++ */
++
+ /* Set up our STL stream output control */
+ png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data);
+
diff -Nru exactimage-0.8.5/debian/patches/series exactimage-0.8.5/debian/patches/series
--- exactimage-0.8.5/debian/patches/series 2011-04-30 20:55:53.000000000 +0900
+++ exactimage-0.8.5/debian/patches/series 2011-05-30 13:38:38.000000000 +0900
@@ -3,3 +3,4 @@
agg-pic.diff
abs-int64_t.diff
utility-timer-dead-code.diff
+debian-changes-0.8.5-1.1
Reply to: