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

Changed interface for drawMatches

Browse Source
This commit is contained in:
Victor Erukhimov 2010-06-12 06:30:00 +00:00
parent b34f0a2fa3
commit c751e901ce
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -45,9 +45,9 @@ using namespace std;
namespace cv namespace cv
{ {
CV_EXPORTS void drawMatches( const Mat& img1, const Mat& img2, CV_EXPORTS void drawMatches( const Mat& img1, const vector<KeyPoint>& keypoints1,
const vector<KeyPoint>& keypoints1, const vector<KeyPoint>& keypoints2, const Mat& img2,const vector<KeyPoint>& keypoints2,
const vector<int>& matches, const vector<char>& mask, Mat& outImg, const vector<int>& matches, Mat& outImg, const vector<char>& mask,
const Scalar& matchColor, const Scalar& singlePointColor, const Scalar& matchColor, const Scalar& singlePointColor,
int flags ) int flags )
{ {

4
samples/cpp/descriptor_extractor_matcher.cpp
View File

@ -98,7 +98,7 @@ void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
mask[i1] = 1; mask[i1] = 1;
} }
// draw inliers // draw inliers
drawMatches( img1, img2, keypoints1, keypoints2, matches, mask, drawImg, CV_RGB(0, 255, 0), CV_RGB(0, 0, 255) ); drawMatches( img1, keypoints1, img2, keypoints2, matches, drawImg, mask, CV_RGB(0, 255, 0), CV_RGB(0, 0, 255) );
// draw outliers // draw outliers
/*for( size_t i1 = 0; i1 < mask.size(); i1++ ) /*for( size_t i1 = 0; i1 < mask.size(); i1++ )
mask[i1] = !mask[i1]; mask[i1] = !mask[i1];
@ -107,7 +107,7 @@ void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
} }
else else
{ {
drawMatches( img1, img2, keypoints1, keypoints2, matches, vector<char>(), drawImg, CV_RGB(0, 255, 0) ); drawMatches( img1, keypoints1, img2, keypoints2, matches, drawImg, vector<char>(), CV_RGB(0, 255, 0) );
} }
imshow( winName, drawImg ); imshow( winName, drawImg );

2
samples/cpp/matcher_simple.cpp
View File

@ -42,7 +42,7 @@ int main(int argc, char** argv)
// drawing the results // drawing the results
namedWindow("matches", 1); namedWindow("matches", 1);
Mat img_matches; Mat img_matches;
drawMatches(img1, img2, keypoints1, keypoints2, matches, vector<char>(), img_matches); drawMatches(img1, keypoints1, img2, keypoints2, matches, img_matches);
imshow("matches", img_matches); imshow("matches", img_matches);
waitKey(0); waitKey(0);