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

work on features2d python interface

Browse Source
This commit is contained in:
Alexander Mordvintsev 2012-07-11 17:13:43 +00:00
parent ffd283b7d5
commit c5669448a3
2 changed files with 7 additions and 7 deletions
modules
features2d/include/opencv2/features2d
features2d.hpp
nonfree/include/opencv2/nonfree
features2d.hpp

4
modules/features2d/include/opencv2/features2d/features2d.hpp

@ -1093,10 +1093,10 @@ protected:
* For efficiency, BruteForceMatcher is templated on the distance metric. * For efficiency, BruteForceMatcher is templated on the distance metric.
* For float descriptors, a common choice would be cv::L2<float>. * For float descriptors, a common choice would be cv::L2<float>.
*/ */
class CV_EXPORTS BFMatcher : public DescriptorMatcher class CV_EXPORTS_W BFMatcher : public DescriptorMatcher
{ {
public: public:
BFMatcher( int normType, bool crossCheck=false ); CV_WRAP BFMatcher( int normType, bool crossCheck=false );
virtual ~BFMatcher() {} virtual ~BFMatcher() {}
virtual bool isMaskSupported() const { return true; } virtual bool isMaskSupported() const { return true; }

10
modules/nonfree/include/opencv2/nonfree/features2d.hpp

@ -58,15 +58,15 @@ namespace cv
class CV_EXPORTS_W SIFT : public Feature2D class CV_EXPORTS_W SIFT : public Feature2D
{ {
public: public:
explicit SIFT( int nfeatures=0, int nOctaveLayers=3, CV_WRAP explicit SIFT( int nfeatures=0, int nOctaveLayers=3,
double contrastThreshold=0.04, double edgeThreshold=10, double contrastThreshold=0.04, double edgeThreshold=10,
double sigma=1.6); double sigma=1.6);
//! returns the descriptor size in floats (128) //! returns the descriptor size in floats (128)
int descriptorSize() const; CV_WRAP int descriptorSize() const;
//! returns the descriptor type //! returns the descriptor type
int descriptorType() const; CV_WRAP int descriptorType() const;
//! finds the keypoints using SIFT algorithm //! finds the keypoints using SIFT algorithm
void operator()(InputArray img, InputArray mask, void operator()(InputArray img, InputArray mask,
@ -121,10 +121,10 @@ public:
CV_WRAP int descriptorType() const; CV_WRAP int descriptorType() const;
//! finds the keypoints using fast hessian detector used in SURF //! finds the keypoints using fast hessian detector used in SURF
CV_WRAP_AS(detect) void operator()(InputArray img, InputArray mask, void operator()(InputArray img, InputArray mask,
CV_OUT vector<KeyPoint>& keypoints) const; CV_OUT vector<KeyPoint>& keypoints) const;
//! finds the keypoints and computes their descriptors. Optionally it can compute descriptors for the user-provided keypoints //! finds the keypoints and computes their descriptors. Optionally it can compute descriptors for the user-provided keypoints
CV_WRAP_AS(detect) void operator()(InputArray img, InputArray mask, void operator()(InputArray img, InputArray mask,
CV_OUT vector<KeyPoint>& keypoints, CV_OUT vector<KeyPoint>& keypoints,
OutputArray descriptors, OutputArray descriptors,
bool useProvidedKeypoints=false) const; bool useProvidedKeypoints=false) const;