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

moved matchesMask

Browse Source
This commit is contained in:
Maria Dimashova
2010-06-12 14:39:56 +00:00
parent 008da75691
commit dd72f2ec52
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2139,9 +2139,9 @@ struct CV_EXPORTS DrawMatchesFlags
// Draws matches of keypints from two images on output image.
CV_EXPORTS void drawMatches( const Mat& img1, const vector<KeyPoint>& keypoints1,
const Mat& img2, const vector<KeyPoint>& keypoints2,
const vector<int>& matches, Mat& outImg, const vector<char>& matchesMask = vector<char>(),
const vector<int>& matches, Mat& outImg,
const Scalar& matchColor = Scalar::all(-1), const Scalar& singlePointColor = Scalar::all(-1),
int flags = DrawMatchesFlags::DEFAULT );
const vector<char>& matchesMask = vector<char>(), int flags = DrawMatchesFlags::DEFAULT );
}

4
modules/features2d/src/descriptors.cpp
View File

@@ -47,9 +47,9 @@ namespace cv
void drawMatches( const Mat& img1, const vector<KeyPoint>& keypoints1,
const Mat& img2,const vector<KeyPoint>& keypoints2,
const vector<int>& matches, Mat& outImg, const vector<char>& matchesMask,
const vector<int>& matches, Mat& outImg,
const Scalar& matchColor, const Scalar& singlePointColor,
int flags )
const vector<char>& matchesMask, int flags )
{
Size size( img1.cols + img2.cols, MAX(img1.rows, img2.rows) );
if( flags & DrawMatchesFlags::DRAW_OVER_OUTIMG )