From c6705fbe2000ebe91545cf6d6e88e503c5bf6fda Mon Sep 17 00:00:00 2001 From: Alexander Mordvintsev Date: Fri, 6 Jul 2012 15:41:57 +0000 Subject: [PATCH] exposed ORB features to python --- .../features2d/include/opencv2/features2d/features2d.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp index 888c2daa49..3f6ecfb8dd 100644 --- a/modules/features2d/include/opencv2/features2d/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d/features2d.hpp @@ -269,14 +269,14 @@ public: /*! ORB implementation. */ -class CV_EXPORTS ORB : public Feature2D +class CV_EXPORTS_W ORB : public Feature2D { public: // the size of the signature in bytes enum { kBytes = 32, HARRIS_SCORE=0, FAST_SCORE=1 }; - explicit ORB(int nfeatures = 500, float scaleFactor = 1.2f, int nlevels = 8, int edgeThreshold = 31, - int firstLevel = 0, int WTA_K=2, int scoreType=HARRIS_SCORE, int patchSize=31 ); + CV_WRAP explicit ORB(int nfeatures = 500, float scaleFactor = 1.2f, int nlevels = 8, int edgeThreshold = 31, + int firstLevel = 0, int WTA_K=2, int scoreType=ORB::HARRIS_SCORE, int patchSize=31 ); // returns the descriptor size in bytes int descriptorSize() const; @@ -1376,7 +1376,7 @@ struct CV_EXPORTS DrawMatchesFlags }; // Draw keypoints. -CV_EXPORTS void drawKeypoints( const Mat& image, const vector& keypoints, Mat& outImage, +CV_EXPORTS_W void drawKeypoints( const Mat& image, const vector& keypoints, CV_OUT Mat& outImage, const Scalar& color=Scalar::all(-1), int flags=DrawMatchesFlags::DEFAULT ); // Draws matches of keypints from two images on output image.