Commit b4275e19 authored by Maria Dimashova's avatar Maria Dimashova

added clear method to GenericDescriptorMatch

parent 9690cd39
...@@ -1559,6 +1559,9 @@ public: ...@@ -1559,6 +1559,9 @@ public:
// Returns the keypoint by its global index // Returns the keypoint by its global index
KeyPoint getKeyPoint( int index ) const; KeyPoint getKeyPoint( int index ) const;
// Clears images, keypoints and startIndices
void clear();
vector<Mat> images; vector<Mat> images;
vector<vector<KeyPoint> > points; vector<vector<KeyPoint> > points;
...@@ -1599,6 +1602,8 @@ public: ...@@ -1599,6 +1602,8 @@ public:
// class_ids A vector to be filled with keypoint class_ids // class_ids A vector to be filled with keypoint class_ids
virtual void match( const Mat& image, vector<KeyPoint>& points, vector<int>& indices ) = 0; virtual void match( const Mat& image, vector<KeyPoint>& points, vector<int>& indices ) = 0;
// Clears keypoints storing in collection
virtual void clear();
protected: protected:
KeyPointCollection collection; KeyPointCollection collection;
}; };
......
...@@ -150,6 +150,13 @@ size_t KeyPointCollection::calcKeypointCount() const ...@@ -150,6 +150,13 @@ size_t KeyPointCollection::calcKeypointCount() const
return *startIndices.rbegin() + points.rbegin()->size(); return *startIndices.rbegin() + points.rbegin()->size();
} }
void KeyPointCollection::clear()
{
images.clear();
points.clear();
startIndices.clear();
}
/* /*
* GenericDescriptorMatch * GenericDescriptorMatch
*/ */
...@@ -169,6 +176,10 @@ void GenericDescriptorMatch::classify( const Mat& image, vector<cv::KeyPoint>& p ...@@ -169,6 +176,10 @@ void GenericDescriptorMatch::classify( const Mat& image, vector<cv::KeyPoint>& p
points[i].class_id = collection.getKeyPoint(keypointIndices[i]).class_id; points[i].class_id = collection.getKeyPoint(keypointIndices[i]).class_id;
}; };
void GenericDescriptorMatch::clear()
{
collection.clear();
}
/****************************************************************************************\ /****************************************************************************************\
* OneWayDescriptorMatch * * OneWayDescriptorMatch *
\****************************************************************************************/ \****************************************************************************************/
......
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