generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed the signature of add method according to the base class

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-02-17 01:37:32 +04:00
parent 3542da7167
commit f74ef644bc
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
View File

@ -28,7 +28,7 @@ with an image set. ::
public: public:
virtual ~DescriptorMatcher(); virtual ~DescriptorMatcher();
virtual void add( InputArray descriptors ); virtual void add( InputArrayOfArrays descriptors );
const vector<Mat>& getTrainDescriptors() const; const vector<Mat>& getTrainDescriptors() const;
virtual void clear(); virtual void clear();
@ -265,7 +265,7 @@ Flann-based descriptor matcher. This matcher trains :ocv:class:`flann::Index_` o
const Ptr<flann::IndexParams>& indexParams=new flann::KDTreeIndexParams(), const Ptr<flann::IndexParams>& indexParams=new flann::KDTreeIndexParams(),
const Ptr<flann::SearchParams>& searchParams=new flann::SearchParams() ); const Ptr<flann::SearchParams>& searchParams=new flann::SearchParams() );
virtual void add( const vector<Mat>& descriptors ); virtual void add( InputArrayOfArrays descriptors );
virtual void clear(); virtual void clear();
virtual void train(); virtual void train();

2
modules/features2d/include/opencv2/features2d.hpp
View File

@ -1157,7 +1157,7 @@ public:
CV_WRAP FlannBasedMatcher( const Ptr<flann::IndexParams>& indexParams=makePtr<flann::KDTreeIndexParams>(), CV_WRAP FlannBasedMatcher( const Ptr<flann::IndexParams>& indexParams=makePtr<flann::KDTreeIndexParams>(),
const Ptr<flann::SearchParams>& searchParams=makePtr<flann::SearchParams>() ); const Ptr<flann::SearchParams>& searchParams=makePtr<flann::SearchParams>() );
virtual void add( const std::vector<Mat>& descriptors ); virtual void add( InputArrayOfArrays descriptors );
virtual void clear(); virtual void clear();
// Reads matcher object from a file node // Reads matcher object from a file node

7
modules/features2d/src/matchers.cpp
View File

@ -1199,9 +1199,12 @@ FlannBasedMatcher::FlannBasedMatcher( const Ptr<flann::IndexParams>& _indexParam
CV_Assert( _searchParams ); CV_Assert( _searchParams );
} }
void FlannBasedMatcher::add( const std::vector<Mat>& descriptors ) void FlannBasedMatcher::add( InputArrayOfArrays _descriptors )
{ {
DescriptorMatcher::add( descriptors ); DescriptorMatcher::add( _descriptors );
std::vector<Mat> descriptors;
_descriptors.getMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ ) for( size_t i = 0; i < descriptors.size(); i++ )
{ {
addedDescCount += descriptors[i].rows; addedDescCount += descriptors[i].rows;