[flann] 04/08: Deleted unused patches

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository flann.

commit ce19a13fe92ba4f9c3af264d52467a1afc5e809a
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Fri Aug 5 23:23:21 2016 +0200

    Deleted unused patches
---
 .../0002-Set-correct-version-of-flann.patch        | 21 -------------
 debian/patches/20_abs-std-abs.patch                | 35 ----------------------
 2 files changed, 56 deletions(-)

diff --git a/debian/patches/0002-Set-correct-version-of-flann.patch b/debian/patches/0002-Set-correct-version-of-flann.patch
deleted file mode 100644
index abda10c..0000000
--- a/debian/patches/0002-Set-correct-version-of-flann.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Fri, 15 Jul 2016 15:00:12 +0200
-Subject: Set correct version of flann
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd56ab9..dbb6386 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ project(flann)
- string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
- 
- include(${PROJECT_SOURCE_DIR}/cmake/flann_utils.cmake)
--set(FLANN_VERSION 1.8.4)
-+set(FLANN_VERSION 1.8.5)
- DISSECT_VERSION()
- GET_OS_INFO()
- 
diff --git a/debian/patches/20_abs-std-abs.patch b/debian/patches/20_abs-std-abs.patch
deleted file mode 100644
index 1d31865..0000000
--- a/debian/patches/20_abs-std-abs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 Mon Sep 17 00:00:00 2001
-From: Alastair Quadros <alastair.j.quadros at 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
-

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