mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 11:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5487 from Wangyida:python

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-11-02 12:26:53 +00:00
commit b5fd7868a8
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ typedef std::vector<float> vector_float;
typedef std::vector<double> vector_double;
typedef std::vector<Point> vector_Point;
typedef std::vector<Point2f> vector_Point2f;
typedef std::vector<Point3f> vector_Point3f;
typedef std::vector<Vec2f> vector_Vec2f;
typedef std::vector<Vec3f> vector_Vec3f;
typedef std::vector<Vec4f> vector_Vec4f;
@ -733,6 +734,23 @@ bool pyopencv_to(PyObject* obj, Point2d& p, const char* name)
return PyArg_ParseTuple(obj, "dd", &p.x, &p.y) > 0;
}
template<>
bool pyopencv_to(PyObject* obj, Point3f& p, const char* name)
{
(void)name;
if(!obj || obj == Py_None)
return true;
return PyArg_ParseTuple(obj, "fff", &p.x, &p.y, &p.z) > 0;
}
template<>
bool pyopencv_to(PyObject* obj, Point3d& p, const char* name)
{
(void)name;
if(!obj || obj == Py_None)
return true;
return PyArg_ParseTuple(obj, "ddd", &p.x, &p.y, &p.z) > 0;
}
template<>
PyObject* pyopencv_from(const Point& p)
@ -746,6 +764,12 @@ PyObject* pyopencv_from(const Point2f& p)
return Py_BuildValue("(dd)", p.x, p.y);
}
template<>
PyObject* pyopencv_from(const Point3f& p)
{
return Py_BuildValue("(ddd)", p.x, p.y, p.z);
}
template<>
bool pyopencv_to(PyObject* obj, Vec3d& v, const char* name)
{
@ -773,6 +797,12 @@ PyObject* pyopencv_from(const Point2d& p)
return Py_BuildValue("(dd)", p.x, p.y);
}
template<>
PyObject* pyopencv_from(const Point3d& p)
{
return Py_BuildValue("(ddd)", p.x, p.y, p.y);
}
template<typename _Tp> struct pyopencvVecConverter
{
static bool to(PyObject* obj, std::vector<_Tp>& value, const ArgInfo info)