diff --git a/include/find_object/Settings.h b/include/find_object/Settings.h index d90ce1c3..9bf74de4 100644 --- a/include/find_object/Settings.h +++ b/include/find_object/Settings.h @@ -337,7 +337,6 @@ public: static bool isBruteForceNearestNeighbor(); static cv::flann::IndexParams * createFlannIndexParams(); static cvflann::flann_distance_t getFlannDistanceType(); - static cv::flann::SearchParams getFlannSearchParams(); static int getHomographyMethod(); diff --git a/src/Settings.cpp b/src/Settings.cpp index 682437eb..05d3d26f 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -1401,14 +1401,6 @@ cvflann::flann_distance_t Settings::getFlannDistanceType() return distance; } -cv::flann::SearchParams Settings::getFlannSearchParams() -{ - return cv::flann::SearchParams( - getNearestNeighbor_search_checks(), - getNearestNeighbor_search_eps(), - getNearestNeighbor_search_sorted()); -} - int Settings::getHomographyMethod() { int method = cv::RANSAC; diff --git a/src/Vocabulary.cpp b/src/Vocabulary.cpp index 5392357c..f69f26c9 100644 --- a/src/Vocabulary.cpp +++ b/src/Vocabulary.cpp @@ -440,7 +440,11 @@ void Vocabulary::search(const cv::Mat & descriptorsIn, cv::Mat & results, cv::Ma } else { - flannIndex_.knnSearch(descriptors, results, dists, k, Settings::getFlannSearchParams()); + flannIndex_.knnSearch(descriptors, results, dists, k, + cv::flann::SearchParams( + Settings::getNearestNeighbor_search_checks(), + Settings::getNearestNeighbor_search_eps(), + Settings::getNearestNeighbor_search_sorted())); } if( dists.type() == CV_32S )