[libvigraimpex] 02/04: add const-swap.patch

[Daniel Stender]

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

stender pushed a commit to branch master
in repository libvigraimpex.

commit 03453b94efb0e96e4e403210aabb56e0264599ee
Author: Daniel Stender <stender at debian.org>
Date:   Tue Aug 8 00:34:20 2017 +0200

    add const-swap.patch
---
 debian/changelog                |  3 ++-
 debian/patches/const-swap.patch | 25 +++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f3ad00b..c8e08a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 libvigraimpex (1.10.0+git20160211.167be93+dfsg-3) UNRELEASED; urgency=medium
 
+  * add const-swap.patch [thanks to Matthias Klose].
   * deb/copyright:
     + add src/images/dissolved_color.gif to Files-Excluded (contains
       "lenna" in composite).
 
- -- Daniel Stender <stender at debian.org>  Sun, 06 Aug 2017 13:42:28 +0200
+ -- Daniel Stender <stender at debian.org>  Tue, 08 Aug 2017 00:47:14 +0200
 
 libvigraimpex (1.10.0+git20160211.167be93+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/patches/const-swap.patch b/debian/patches/const-swap.patch
new file mode 100644
index 0000000..926bec9
--- /dev/null
+++ b/debian/patches/const-swap.patch
@@ -0,0 +1,25 @@
+From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely at redhat.com>
+Date: Fri, 17 Feb 2017 00:55:25 +0000
+Subject: [PATCH] Fix parameter of ImagePyramid::swap
+
+You can't swap with a const object. This fixes a compilation failure
+with GCC 7 which rejects the incorrect function even if it isn't
+instantiated.
+---
+ include/vigra/imagecontainer.hxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx
+index a6f0f80..636cc64 100644
+--- a/include/vigra/imagecontainer.hxx
++++ b/include/vigra/imagecontainer.hxx
+@@ -763,7 +763,7 @@ public:
+         /** swap contents of this array with the contents of other
+             (STL-Container interface)
+          */
+-    void swap(const ImagePyramid<ImageType, Alloc> &other)
++    void swap(ImagePyramid<ImageType, Alloc> &other)
+     {
+         images_.swap(other.images_);
+         std::swap(lowestLevel_, other.lowestLevel_);
diff --git a/debian/patches/series b/debian/patches/series
index 264289e..0a37ad5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ docsrc-out-of-source.diff
 docsrc-paths.diff
 vigra-config-docdir.diff
 removed-static-docs.diff
+const-swap.patch

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