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

drawMatches python bindings

Browse Source
This commit is contained in:
abidrahmank 2013-07-11 09:28:37 +05:30
parent 68a992b075
commit 5d863f7516
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1404,15 +1404,15 @@ CV_EXPORTS_W void drawKeypoints( const Mat& image, const std::vector<KeyPoint>&
const Scalar& color=Scalar::all(-1), int flags=DrawMatchesFlags::DEFAULT ); const Scalar& color=Scalar::all(-1), int flags=DrawMatchesFlags::DEFAULT );
// 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 std::vector<KeyPoint>& keypoints1, CV_EXPORTS_W 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<DMatch>& matches1to2, Mat& outImg, const std::vector<DMatch>& matches1to2, CV_OUT Mat& outImg,
const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1), const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1),
const std::vector<char>& matchesMask=std::vector<char>(), int flags=DrawMatchesFlags::DEFAULT ); const std::vector<char>& matchesMask=std::vector<char>(), int flags=DrawMatchesFlags::DEFAULT );
CV_EXPORTS void drawMatches( const Mat& img1, const std::vector<KeyPoint>& keypoints1, CV_EXPORTS_AS(drawMatchesKnn) 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, CV_OUT Mat& outImg,
const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1), const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1),
const std::vector<std::vector<char> >& matchesMask=std::vector<std::vector<char> >(), int flags=DrawMatchesFlags::DEFAULT ); const std::vector<std::vector<char> >& matchesMask=std::vector<std::vector<char> >(), int flags=DrawMatchesFlags::DEFAULT );

9
modules/python/src2/cv2.cpp
View File

@ -97,6 +97,7 @@ using namespace cv;
typedef cv::softcascade::ChannelFeatureBuilder softcascade_ChannelFeatureBuilder; typedef cv::softcascade::ChannelFeatureBuilder softcascade_ChannelFeatureBuilder;
typedef std::vector<uchar> vector_uchar; typedef std::vector<uchar> vector_uchar;
typedef std::vector<char> vector_char;
typedef std::vector<int> vector_int; typedef std::vector<int> vector_int;
typedef std::vector<float> vector_float; typedef std::vector<float> vector_float;
typedef std::vector<double> vector_double; typedef std::vector<double> vector_double;
@ -112,6 +113,8 @@ typedef std::vector<KeyPoint> vector_KeyPoint;
typedef std::vector<Mat> vector_Mat; typedef std::vector<Mat> vector_Mat;
typedef std::vector<DMatch> vector_DMatch; typedef std::vector<DMatch> vector_DMatch;
typedef std::vector<String> vector_String; typedef std::vector<String> vector_String;
typedef std::vector<std::vector<char> > vector_vector_char;
typedef std::vector<std::vector<Point> > vector_vector_Point; typedef std::vector<std::vector<Point> > vector_vector_Point;
typedef std::vector<std::vector<Point2f> > vector_vector_Point2f; typedef std::vector<std::vector<Point2f> > vector_vector_Point2f;
typedef std::vector<std::vector<Point3f> > vector_vector_Point3f; typedef std::vector<std::vector<Point3f> > vector_vector_Point3f;
@ -830,7 +833,7 @@ template<typename _Tp> struct pyopencvVecConverter
} }
}; };
template <typename _Tp> template<typename _Tp>
bool pyopencv_to(PyObject* obj, std::vector<_Tp>& value, const ArgInfo info) bool pyopencv_to(PyObject* obj, std::vector<_Tp>& value, const ArgInfo info)
{ {
return pyopencvVecConverter<_Tp>::to(obj, value, info); return pyopencvVecConverter<_Tp>::to(obj, value, info);
@ -888,9 +891,9 @@ template<typename _Tp> static inline PyObject* pyopencv_from_generic_vec(const s
template<typename _Tp> struct pyopencvVecConverter<std::vector<_Tp> > template<typename _Tp> struct pyopencvVecConverter<std::vector<_Tp> >
{ {
static bool to(PyObject* obj, std::vector<std::vector<_Tp> >& value, const char* name="<unknown>") static bool to(PyObject* obj, std::vector<std::vector<_Tp> >& value, const ArgInfo info)
{ {
return pyopencv_to_generic_vec(obj, value, name); return pyopencv_to_generic_vec(obj, value, info);
} }
static PyObject* from(const std::vector<std::vector<_Tp> >& value) static PyObject* from(const std::vector<std::vector<_Tp> >& value)