[freeimage] 02/08: Apply debdiff from NMU release 3.17.0+ds1-1.1.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository freeimage.

commit b75ab58b313eadd4f8ec232de06de236da7d21cb
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Mar 4 09:19:28 2016 +0000

    Apply debdiff from NMU release 3.17.0+ds1-1.1.
---
 debian/changelog              |  7 +++++++
 debian/patches/libpng16.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5976a3f..f479fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freeimage (3.17.0+ds1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * FTBFS with libpng1.6: New patch libpng16.patch (Closes: #742560)
+
+ -- Tobias Frost <tobi at debian.org>  Fri, 22 Jan 2016 06:33:47 +0100
+
 freeimage (3.17.0+ds1-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/patches/libpng16.patch b/debian/patches/libpng16.patch
new file mode 100644
index 0000000..7257a06
--- /dev/null
+++ b/debian/patches/libpng16.patch
@@ -0,0 +1,34 @@
+--- a/Source/FreeImage/PluginPNG.cpp
++++ b/Source/FreeImage/PluginPNG.cpp
+@@ -713,11 +713,19 @@
+ 
+ 			if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+ 				png_charp profile_name = NULL;
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++				png_bytepp profile_data = NULL;
++#else
+ 				png_charp profile_data = NULL;
++#endif
+ 				png_uint_32 profile_length = 0;
+ 				int  compression_type;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++				png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, profile_data, &profile_length);
++#else
+ 				png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_length);
++#endif
+ 
+ 				// copy ICC profile data (must be done after FreeImage_AllocateHeader)
+ 
+@@ -1000,7 +1008,11 @@
+ 
+ 			FIICCPROFILE *iccProfile = FreeImage_GetICCProfile(dib);
+ 			if (iccProfile->size && iccProfile->data) {
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++				//png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size);
++#else
+ 				png_set_iCCP(png_ptr, info_ptr, "Embedded Profile", 0, (png_charp)iccProfile->data, iccProfile->size);
++#endif
+ 			}
+ 
+ 			// write metadata
diff --git a/debian/patches/series b/debian/patches/series
index f756876..f5dab4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ Fix-missing-cstdio-include-in-testsuite.patch
 Fix-endianness-detection.patch
 Fix-CVE-2015-0852.patch
 Fix-encoding-of-fi-header.patch
+libpng16.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git