From d8b93b356908d692be122ae41af7d2caef82aa16 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 1 Aug 2011 15:06:11 +0000 Subject: [PATCH] Minor bugfix. --- modules/java/src/cpp/features2d_manual.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/java/src/cpp/features2d_manual.hpp b/modules/java/src/cpp/features2d_manual.hpp index 2a306ef..0ed747b 100644 --- a/modules/java/src/cpp/features2d_manual.hpp +++ b/modules/java/src/cpp/features2d_manual.hpp @@ -10,11 +10,11 @@ class CV_EXPORTS_AS(FeatureDetector) javaFeatureDetector : public FeatureDetecto { public: #if 0 - void detect( const Mat& image, vector& keypoints, const Mat& mask=Mat() ) const; - void detect( const vector& images, vector >& keypoints, const vector& masks=vector() ) const; - virtual void read( const FileNode& ); - virtual void write( FileStorage& ) const; - virtual bool empty() const; + CV_WRAP void detect( const Mat& image, vector& keypoints, const Mat& mask=Mat() ) const; + CV_WRAP void detect( const vector& images, vector >& keypoints, const vector& masks=vector() ) const; + CV_WRAP virtual void read( const FileNode& ); + CV_WRAP virtual void write( FileStorage& ) const; + CV_WRAP virtual bool empty() const; #endif //supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX) @@ -58,7 +58,7 @@ public: CV_WRAP_AS(clone) javaDescriptorMatcher* jclone( bool emptyTrainData=false ) const { - Ptr matcher = DescriptorMatcher::clone(emptyTrainData); + Ptr matcher = this->clone(emptyTrainData); matcher.addref(); return (javaDescriptorMatcher*)((DescriptorMatcher*) matcher); } -- 2.7.4