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

New api matcher

parent 3e717829
No related branches found
No related tags found
No related merge requests found
......@@ -35,24 +35,6 @@ Scalar MatcherBase::match(const cv::Mat& _desc1, const cv::Mat& _desc2, const in
return normalized_scores[0];
}
//std::vector<Scalar> MatcherBase::match(const cv::Mat& _desc1, const cv::Mat& _desc2, const int& _desc_size_bytes, DMatchVector& _matches)
//{
// std::vector<Scalar> normalized_scores;
// if (params_base_ptr_->match_type == MATCH)
// normalized_scores = match(_desc1,_desc2,_desc_size_bytes,_matches);
// else
// {
// std::vector< DMatchVector > matches;
// normalized_scores = match(_desc1,_desc2,_desc_size_bytes,matches);
// // here we get only the best match
// _matches.clear();
// for (auto m : matches)
// _matches.push_back(m[0]);
// }
//
// return normalized_scores;
//}
std::vector<Scalar> MatcherBase::match(const cv::Mat& _desc1, const cv::Mat& _desc2, const int& desc_size_bytes, DMatchVector& matches, cv::InputArray _mask)
{
std::vector<Scalar> normalized_scores;
......
......@@ -70,7 +70,6 @@ class MatcherBase : public VUBase, public std::enable_shared_from_this<MatcherBa
std::vector<Scalar> match(const cv::Mat& _desc1, const cv::Mat& _desc2, const int& desc_size_bytes, DMatchVector& matches, cv::InputArray _mask=cv::noArray());
std::vector<Scalar> match(const cv::Mat& _desc1, const cv::Mat& _desc2, const int& desc_size_bytes, std::vector< DMatchVector >& matches, cv::InputArray _mask=cv::noArray());
// std::vector<Scalar> match(const cv::Mat& _desc1, const cv::Mat& _desc2, const int& desc_size_bytes, DMatchVector& _match);
Scalar match(const cv::Mat& _desc1, const cv::Mat& _desc2, const int& desc_size_bytes, cv::DMatch& _match);
void filterByDistance(const int& _max_pixel_dist, const float& _percentage, const KeyPointVector& _kpts1,const KeyPointVector& _kpts2, const DMatchVector& _dirty, const int& _img_width, const int& _img_height, DMatchVector& _filtered_matches, KeyPointVector& _filtered_kpts, KeyPointVector& _filtered_kpts_prev);
......
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