Merge pull request #18724 from S-o-T:fix_confusing_naming_for_keypoints_comparator

This commit is contained in:
Alexander Alekhin 2020-11-03 20:20:11 +00:00
commit 24d60da553

View File

@ -44,9 +44,9 @@
namespace cv namespace cv
{ {
struct KeypointResponseGreaterThanThreshold struct KeypointResponseGreaterThanOrEqualToThreshold
{ {
KeypointResponseGreaterThanThreshold(float _value) : KeypointResponseGreaterThanOrEqualToThreshold(float _value) :
value(_value) value(_value)
{ {
} }
@ -83,7 +83,7 @@ void KeyPointsFilter::retainBest(std::vector<KeyPoint>& keypoints, int n_points)
//use std::partition to grab all of the keypoints with the boundary response. //use std::partition to grab all of the keypoints with the boundary response.
std::vector<KeyPoint>::const_iterator new_end = std::vector<KeyPoint>::const_iterator new_end =
std::partition(keypoints.begin() + n_points, keypoints.end(), std::partition(keypoints.begin() + n_points, keypoints.end(),
KeypointResponseGreaterThanThreshold(ambiguous_response)); KeypointResponseGreaterThanOrEqualToThreshold(ambiguous_response));
//resize the keypoints, given this new end point. nth_element and partition reordered the points inplace //resize the keypoints, given this new end point. nth_element and partition reordered the points inplace
keypoints.resize(new_end - keypoints.begin()); keypoints.resize(new_end - keypoints.begin());
} }