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

Merge pull request #6214 from vonnieda:java_features2d

Browse Source
This commit is contained in:
Maksim Shabunin
2016-03-21 11:51:11 +00:00
parent a4e35d83ff f4b502dd03
commit f3127521f3
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/features2d/misc/java/filelist
View File

@@ -1 +1,2 @@
misc/java/src/cpp/features2d_manual.hpp misc/java/src/cpp/features2d_manual.hpp
include/opencv2/features2d.hpp

11
modules/features2d/misc/java/src/cpp/features2d_manual.hpp
View File

@@ -408,17 +408,6 @@ enum
// orientation will be drawn. // orientation will be drawn.
}; };
// Draw keypoints.
CV_EXPORTS_W void drawKeypoints( const Mat& image, const std::vector<KeyPoint>& 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<KeyPoint>& keypoints1,
const Mat& img2, const std::vector<KeyPoint>& keypoints2,
const std::vector<DMatch>& matches1to2, Mat& outImg,
const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1),
const std::vector<char>& matchesMask=std::vector<char>(), int flags=0 );
CV_EXPORTS_AS(drawMatches2) void drawMatches( const Mat& img1, const std::vector<KeyPoint>& keypoints1, CV_EXPORTS_AS(drawMatches2) void drawMatches( const Mat& img1, const std::vector<KeyPoint>& keypoints1,
const Mat& img2, const std::vector<KeyPoint>& keypoints2, const Mat& img2, const std::vector<KeyPoint>& keypoints2,
const std::vector<std::vector<DMatch> >& matches1to2, Mat& outImg, const std::vector<std::vector<DMatch> >& matches1to2, Mat& outImg,

2
modules/java/generator/gen_java.py
View File

@@ -13,6 +13,8 @@ else:
class_ignore_list = ( class_ignore_list = (
#core #core
"FileNode", "FileStorage", "KDTree", "KeyPoint", "DMatch", "FileNode", "FileStorage", "KDTree", "KeyPoint", "DMatch",
#features2d
"SimpleBlobDetector", "FlannBasedMatcher", "DescriptorMatcher"
) )
const_ignore_list = ( const_ignore_list = (