diff --git a/modules/features2d/misc/java/filelist b/modules/features2d/misc/java/filelist index d4ff5ec26..0430b5423 100644 --- a/modules/features2d/misc/java/filelist +++ b/modules/features2d/misc/java/filelist @@ -1 +1,2 @@ misc/java/src/cpp/features2d_manual.hpp +include/opencv2/features2d.hpp diff --git a/modules/features2d/misc/java/src/cpp/features2d_manual.hpp b/modules/features2d/misc/java/src/cpp/features2d_manual.hpp index abd66235a..85b9489a2 100644 --- a/modules/features2d/misc/java/src/cpp/features2d_manual.hpp +++ b/modules/features2d/misc/java/src/cpp/features2d_manual.hpp @@ -408,17 +408,6 @@ enum // orientation will be drawn. }; -// Draw keypoints. -CV_EXPORTS_W void drawKeypoints( const Mat& image, const std::vector& keypoints, Mat& outImage, - const Scalar& color=Scalar::all(-1), int flags=0 ); - -// Draws matches of keypints from two images on output image. -CV_EXPORTS_W void drawMatches( const Mat& img1, const std::vector& keypoints1, - const Mat& img2, const std::vector& keypoints2, - const std::vector& matches1to2, Mat& outImg, - const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1), - const std::vector& matchesMask=std::vector(), int flags=0 ); - CV_EXPORTS_AS(drawMatches2) void drawMatches( const Mat& img1, const std::vector& keypoints1, const Mat& img2, const std::vector& keypoints2, const std::vector >& matches1to2, Mat& outImg, diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py index 8c869756b..339054d10 100755 --- a/modules/java/generator/gen_java.py +++ b/modules/java/generator/gen_java.py @@ -13,6 +13,8 @@ else: class_ignore_list = ( #core "FileNode", "FileStorage", "KDTree", "KeyPoint", "DMatch", + #features2d + "SimpleBlobDetector", "FlannBasedMatcher", "DescriptorMatcher" ) const_ignore_list = (