Skip to content
Snippets Groups Projects
Commit 74b51996 authored by Angel Santamaria-Navarro's avatar Angel Santamaria-Navarro
Browse files

API upgrade to use ANMS

parent 4b91c87c
No related branches found
No related tags found
No related merge requests found
...@@ -192,8 +192,8 @@ SET(headers_alg_activesearch ...@@ -192,8 +192,8 @@ SET(headers_alg_activesearch
SET(headers_alg_residualtrilinearity SET(headers_alg_residualtrilinearity
algorithms/residualtrilinearity/alg_residualtrilinearity.h) algorithms/residualtrilinearity/alg_residualtrilinearity.h)
SET(headers_alg_anms SET(headers_alg_anms
algorithms/anms/range-tree/lrtypes.h algorithms/anms/range_tree_lrtypes.h
algorithms/anms/range-tree/ranget.h algorithms/anms/range_tree_ranget.h
algorithms/anms/nanoflann.hpp algorithms/anms/nanoflann.hpp
algorithms/anms/anms.h) algorithms/anms/anms.h)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <opencv2/opencv.hpp> #include <opencv2/opencv.hpp>
#include "nanoflann.hpp" #include "nanoflann.hpp"
#include "range-tree/ranget.h" #include "range_tree_ranget.h"
namespace vision_utils { namespace vision_utils {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#ifndef LIBRANGET #ifndef LIBRANGET
#define LIBRANGET #define LIBRANGET
#include "lrtypes.h" #include "range_tree_lrtypes.h"
/* The following block ships the data away and uses an offset to access it. /* The following block ships the data away and uses an offset to access it.
It's only used on 64-bit platforms where 64-bit pointers are the majority It's only used on 64-bit platforms where 64-bit pointers are the majority
......
...@@ -27,7 +27,6 @@ void sortByResponse(const KeyPointVector& _kps_in, KeyPointVector& _kps_out, con ...@@ -27,7 +27,6 @@ void sortByResponse(const KeyPointVector& _kps_in, KeyPointVector& _kps_out, con
{ {
assert(!_kps_in.empty() && "[vision_utils]: sortByResponse failed. Input KeyPoints vector is empty."); assert(!_kps_in.empty() && "[vision_utils]: sortByResponse failed. Input KeyPoints vector is empty.");
assert(_kps_out.empty() && "[vision_utils]: sortByResponse failed. Output KeyPoints vector is not empty."); assert(_kps_out.empty() && "[vision_utils]: sortByResponse failed. Output KeyPoints vector is not empty.");
assert((_type==CV_SORT_ASCENDING || _type == CV_SORT_DESCENDING) && "[vision_utils]: sortByResponse failed. Sort type currently not implemented.");
std::vector<int> Indx = sortByResponse(_kps_in, _type); std::vector<int> Indx = sortByResponse(_kps_in, _type);
for (unsigned int ii = 0; ii < _kps_in.size(); ii++) for (unsigned int ii = 0; ii < _kps_in.size(); ii++)
...@@ -44,7 +43,6 @@ void sortByResponse(const KeyPointVector& _kps_in, KeyPointVector& _kps_out, con ...@@ -44,7 +43,6 @@ void sortByResponse(const KeyPointVector& _kps_in, KeyPointVector& _kps_out, con
{ {
assert(!_kps_in.empty() && "[vision_utils]: sortByResponse failed. Input KeyPoints vector is empty."); assert(!_kps_in.empty() && "[vision_utils]: sortByResponse failed. Input KeyPoints vector is empty.");
assert(_kps_out.empty() && "[vision_utils]: sortByResponse failed. Output KeyPoints vector is not empty."); assert(_kps_out.empty() && "[vision_utils]: sortByResponse failed. Output KeyPoints vector is not empty.");
assert((_type==CV_SORT_ASCENDING || _type == CV_SORT_DESCENDING) && "[vision_utils]: sortByResponse failed. Sort type currently not implemented.");
std::vector<int> Indx = sortByResponse(_kps_in, _type); std::vector<int> Indx = sortByResponse(_kps_in, _type);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment