mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 23:51:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix regression issues in Feature2D and DescriptorMatcher interfaces

Browse Source
This commit is contained in:
abratchik 2016-10-16 13:33:12 +04:00
parent 1ae27eb696
commit adbb1471fc
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,8 +153,8 @@ public:
@param masks Masks for each input image specifying where to look for keypoints (optional). @param masks Masks for each input image specifying where to look for keypoints (optional).
masks[i] is a mask for images[i]. masks[i] is a mask for images[i].
*/ */
virtual void detect( InputArrayOfArrays images, CV_WRAP virtual void detect( InputArrayOfArrays images,
std::vector<std::vector<KeyPoint> >& keypoints, CV_OUT std::vector<std::vector<KeyPoint> >& keypoints,
InputArrayOfArrays masks=noArray() ); InputArrayOfArrays masks=noArray() );
/** @brief Computes the descriptors for a set of keypoints detected in an image (first variant) or image set /** @brief Computes the descriptors for a set of keypoints detected in an image (first variant) or image set
@ -182,8 +182,8 @@ public:
descriptors computed for a keypoints[i]. Row j is the keypoints (or keypoints[i]) is the descriptors computed for a keypoints[i]. Row j is the keypoints (or keypoints[i]) is the
descriptor for keypoint j-th keypoint. descriptor for keypoint j-th keypoint.
*/ */
virtual void compute( InputArrayOfArrays images, CV_WRAP virtual void compute( InputArrayOfArrays images,
std::vector<std::vector<KeyPoint> >& keypoints, CV_OUT CV_IN_OUT std::vector<std::vector<KeyPoint> >& keypoints,
OutputArrayOfArrays descriptors ); OutputArrayOfArrays descriptors );
/** Detects keypoints and computes the descriptors */ /** Detects keypoints and computes the descriptors */
@ -196,6 +196,14 @@ public:
CV_WRAP virtual int descriptorType() const; CV_WRAP virtual int descriptorType() const;
CV_WRAP virtual int defaultNorm() const; CV_WRAP virtual int defaultNorm() const;
CV_WRAP void write( const String& fileName ) const;
CV_WRAP void read( const String& fileName );
virtual void write( FileStorage&) const;
virtual void read( const FileNode&);
//! Return true if detector object is empty //! Return true if detector object is empty
CV_WRAP virtual bool empty() const; CV_WRAP virtual bool empty() const;
}; };
@ -878,7 +886,7 @@ public:
returned in the distance increasing order. returned in the distance increasing order.
*/ */
CV_WRAP void radiusMatch( InputArray queryDescriptors, InputArray trainDescriptors, CV_WRAP void radiusMatch( InputArray queryDescriptors, InputArray trainDescriptors,
std::vector<std::vector<DMatch> >& matches, float maxDistance, CV_OUT std::vector<std::vector<DMatch> >& matches, float maxDistance,
InputArray mask=noArray(), bool compactResult=false ) const; InputArray mask=noArray(), bool compactResult=false ) const;
/** @overload /** @overload
@ -915,7 +923,7 @@ public:
false, the matches vector has the same size as queryDescriptors rows. If compactResult is true, false, the matches vector has the same size as queryDescriptors rows. If compactResult is true,
the matches vector does not contain matches for fully masked-out query descriptors. the matches vector does not contain matches for fully masked-out query descriptors.
*/ */
void radiusMatch( InputArray queryDescriptors, std::vector<std::vector<DMatch> >& matches, float maxDistance, CV_WRAP void radiusMatch( InputArray queryDescriptors, CV_OUT std::vector<std::vector<DMatch> >& matches, float maxDistance,
InputArrayOfArrays masks=noArray(), bool compactResult=false ); InputArrayOfArrays masks=noArray(), bool compactResult=false );

20
modules/features2d/src/feature2d.cpp
View File

@ -154,6 +154,26 @@ void Feature2D::detectAndCompute( InputArray, InputArray,
CV_Error(Error::StsNotImplemented, ""); CV_Error(Error::StsNotImplemented, "");
} }
void Feature2D::write( const String& fileName ) const
{
FileStorage fs(fileName, FileStorage::WRITE);
write(fs);
}
void Feature2D::read( const String& fileName )
{
FileStorage fs(fileName, FileStorage::READ);
read(fs.root());
}
void Feature2D::write( FileStorage&) const
{
}
void Feature2D::read( const FileNode&)
{
}
int Feature2D::descriptorSize() const int Feature2D::descriptorSize() const
{ {
return 0; return 0;