Control: tags 822717 + patch Control: tags 822717 + pending Dear maintainer,
I've prepared an NMU for flann (versioned as 1.8.4-4.2) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards. -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff -Nru flann-1.8.4/debian/changelog flann-1.8.4/debian/changelog
--- flann-1.8.4/debian/changelog 2014-08-06 08:35:05.000000000 +0200
+++ flann-1.8.4/debian/changelog 2016-07-30 15:09:15.000000000 +0200
@@ -1,3 +1,12 @@
+flann (1.8.4-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 20_abs-std-abs.patch: 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 from
+ upstream GIT. Use std::abs instead of abs, fixing gcc6 build error.
+ Closes: #822717
+
+ -- Andreas Metzler <ametz...@debian.org> Sat, 30 Jul 2016 15:07:35 +0200
+
flann (1.8.4-4.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru flann-1.8.4/debian/patches/20_abs-std-abs.patch flann-1.8.4/debian/patches/20_abs-std-abs.patch
--- flann-1.8.4/debian/patches/20_abs-std-abs.patch 1970-01-01 01:00:00.000000000 +0100
+++ flann-1.8.4/debian/patches/20_abs-std-abs.patch 2016-07-30 14:59:04.000000000 +0200
@@ -0,0 +1,35 @@
+From 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 Mon Sep 17 00:00:00 2001
+From: Alastair Quadros <alastair.j.quad...@gmail.com>
+Date: Sun, 15 Mar 2015 10:58:57 +1100
+Subject: [PATCH] abs -> std::abs
+
+warning: using integer absolute value function 'abs' when argument is of
+floating point type [-Wabsolute-value]
+---
+ src/cpp/flann/algorithms/kdtree_index.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/cpp/flann/algorithms/kdtree_index.h b/src/cpp/flann/algorithms/kdtree_index.h
+index 42659ca..fc12d8f 100644
+--- a/src/cpp/flann/algorithms/kdtree_index.h
++++ b/src/cpp/flann/algorithms/kdtree_index.h
+@@ -36,6 +36,7 @@
+ #include <cassert>
+ #include <cstring>
+ #include <stdarg.h>
++#include <cmath>
+
+ #include "flann/general.h"
+ #include "flann/algorithms/nn_index.h"
+@@ -663,7 +664,7 @@ private:
+ ElementType max_span = 0;
+ size_t div_feat = 0;
+ for (size_t i=0;i<veclen_;++i) {
+- ElementType span = abs(point[i]-leaf_point[i]);
++ ElementType span = std::abs(point[i]-leaf_point[i]);
+ if (span > max_span) {
+ max_span = span;
+ div_feat = i;
+--
+2.8.1
+
diff -Nru flann-1.8.4/debian/patches/series flann-1.8.4/debian/patches/series
--- flann-1.8.4/debian/patches/series 2014-08-06 08:33:43.000000000 +0200
+++ flann-1.8.4/debian/patches/series 2016-07-30 15:15:42.000000000 +0200
@@ -1,3 +1,4 @@
remove_tests.patch
fixmultiarchlibinstall.patch
fix-cmake-hdf5.patch
+20_abs-std-abs.patch
signature.asc
Description: PGP signature
