diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d00212ed8c5e481ece97c871e97d2f202aa1d4f5..962e4da39f551e974250c43bf32079b29201ce22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -192,8 +192,8 @@ SET(headers_alg_activesearch SET(headers_alg_residualtrilinearity algorithms/residualtrilinearity/alg_residualtrilinearity.h) SET(headers_alg_anms - algorithms/anms/range-tree/lrtypes.h - algorithms/anms/range-tree/ranget.h + algorithms/anms/range_tree_lrtypes.h + algorithms/anms/range_tree_ranget.h algorithms/anms/nanoflann.hpp algorithms/anms/anms.h) diff --git a/src/algorithms/anms/anms.h b/src/algorithms/anms/anms.h index b1cba9382fb1cfe7c219204cdb12c2a26f1f5d71..3cb2d17fb68afa4d5fd1b9879b96213bf5b1d123 100644 --- a/src/algorithms/anms/anms.h +++ b/src/algorithms/anms/anms.h @@ -5,7 +5,7 @@ #include <stdlib.h> #include <opencv2/opencv.hpp> #include "nanoflann.hpp" -#include "range-tree/ranget.h" +#include "range_tree_ranget.h" namespace vision_utils { diff --git a/src/algorithms/anms/range-tree/lrtypes.h b/src/algorithms/anms/range_tree_lrtypes.h similarity index 100% rename from src/algorithms/anms/range-tree/lrtypes.h rename to src/algorithms/anms/range_tree_lrtypes.h diff --git a/src/algorithms/anms/range-tree/ranget.h b/src/algorithms/anms/range_tree_ranget.h similarity index 99% rename from src/algorithms/anms/range-tree/ranget.h rename to src/algorithms/anms/range_tree_ranget.h index 0d6e157dae48f5ff4b0ff984023143f97ce4e3f6..fc9fe0dc0caae989be3e5deb16abfe26355aa0b8 100644 --- a/src/algorithms/anms/range-tree/ranget.h +++ b/src/algorithms/anms/range_tree_ranget.h @@ -18,7 +18,7 @@ #ifndef 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. It's only used on 64-bit platforms where 64-bit pointers are the majority diff --git a/src/vision_utils.cpp b/src/vision_utils.cpp index 177f94a6967a307d8fcdf77f2645c3f68f5cad46..9fcc4392ba1ac9c10dc6bf9d99e5a19f9f063983 100644 --- a/src/vision_utils.cpp +++ b/src/vision_utils.cpp @@ -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_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); for (unsigned int ii = 0; ii < _kps_in.size(); ii++) @@ -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_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);