fixed #46
This commit is contained in:
@@ -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;
|
||||
|
||||
+5
-1
@@ -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 )
|
||||
|
||||
Reference in New Issue
Block a user