Commit 4a430413 authored by Maria Dimashova's avatar Maria Dimashova

minor changes

parent 7bda8266
...@@ -425,7 +425,7 @@ void GridAdaptedFeatureDetector::detect( const Mat& image, vector<KeyPoint>& key ...@@ -425,7 +425,7 @@ void GridAdaptedFeatureDetector::detect( const Mat& image, vector<KeyPoint>& key
} }
/* /*
* GridAdaptedFeatureDetector * PyramidAdaptedFeatureDetector
*/ */
PyramidAdaptedFeatureDetector::PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& _detector, int _levels ) PyramidAdaptedFeatureDetector::PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& _detector, int _levels )
: detector(_detector), levels(_levels) : detector(_detector), levels(_levels)
......
...@@ -231,7 +231,7 @@ void BruteForceMatcher<L2<float> >::knnMatchImpl( const Mat& queryDescs, vector< ...@@ -231,7 +231,7 @@ void BruteForceMatcher<L2<float> >::knnMatchImpl( const Mat& queryDescs, vector<
const vector<Mat>& masks, bool compactResult ) const vector<Mat>& masks, bool compactResult )
{ {
#ifndef HAVE_EIGEN2 #ifndef HAVE_EIGEN2
bfKnnMatchImpl<L2<float> >( *this, queryDescs, matches, knn, masks, compactResult ); bfKnnMatchImpl( *this, queryDescs, matches, knn, masks, compactResult );
#else #else
CV_Assert( queryDescs.type() == CV_32FC1 || queryDescs.empty() ); CV_Assert( queryDescs.type() == CV_32FC1 || queryDescs.empty() );
CV_Assert( masks.empty() || masks.size() == trainDescCollection.size() ); CV_Assert( masks.empty() || masks.size() == trainDescCollection.size() );
...@@ -319,7 +319,7 @@ void BruteForceMatcher<L2<float> >::radiusMatchImpl( const Mat& queryDescs, vect ...@@ -319,7 +319,7 @@ void BruteForceMatcher<L2<float> >::radiusMatchImpl( const Mat& queryDescs, vect
const vector<Mat>& masks, bool compactResult ) const vector<Mat>& masks, bool compactResult )
{ {
#ifndef HAVE_EIGEN2 #ifndef HAVE_EIGEN2
bfRadiusMatchImpl<L2<float> >( *this, queryDescs, matches, maxDistance, masks, compactResult ); bfRadiusMatchImpl( *this, queryDescs, matches, maxDistance, masks, compactResult );
#else #else
CV_Assert( queryDescs.type() == CV_32FC1 || queryDescs.empty() ); CV_Assert( queryDescs.type() == CV_32FC1 || queryDescs.empty() );
CV_Assert( masks.empty() || masks.size() == trainDescCollection.size() ); CV_Assert( masks.empty() || masks.size() == trainDescCollection.size() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment