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

cvarrseq args attempt array conversions first

Browse Source
This commit is contained in:
James Bowman 2010-07-23 17:55:37 +00:00
parent d10b3c8665
commit b4af9c620a
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/python/cv.cpp
View File

@ -1718,10 +1718,28 @@ struct cvarrseq {
}; };
}; };
static int is_convertible_to_mat(PyObject *o)
{
#if PYTHON_USE_NUMPY
if (PyObject_HasAttrString(o, "__array_struct__")) {
PyObject *ao = PyObject_GetAttrString(o, "__array_struct__");
if (ao != NULL &&
PyCObject_Check(ao) &&
((PyArrayInterface*)PyCObject_AsVoidPtr(ao))->two == 2) {
return 1;
}
}
#endif
return is_iplimage(o) && is_cvmat(o) && is_cvmatnd(o);
}
static int convert_to_cvarrseq(PyObject *o, cvarrseq *dst, const char *name = "no_name") static int convert_to_cvarrseq(PyObject *o, cvarrseq *dst, const char *name = "no_name")
{ {
if (PyType_IsSubtype(o->ob_type, &cvseq_Type)) { if (PyType_IsSubtype(o->ob_type, &cvseq_Type)) {
return convert_to_CvSeq(o, &(dst->seq), name); return convert_to_CvSeq(o, &(dst->seq), name);
} else if (is_convertible_to_mat(o)) {
int r = convert_to_CvArr(o, &(dst->mat), name);
return r;
} else if (PySequence_Check(o)) { } else if (PySequence_Check(o)) {
PyObject *fi = PySequence_Fast(o, name); PyObject *fi = PySequence_Fast(o, name);
if (fi == NULL) if (fi == NULL)
@ -1747,7 +1765,11 @@ static int convert_to_cvarrseq(PyObject *o, cvarrseq *dst, const char *name = "n
assert(fe != NULL); assert(fe != NULL);
int *pdst = (int*)cvPtr2D(mt, i, 0); int *pdst = (int*)cvPtr2D(mt, i, 0);
for (Py_ssize_t j = 0; j < size; j++) { for (Py_ssize_t j = 0; j < size; j++) {
*pdst++ = PyInt_AsLong(PySequence_Fast_GET_ITEM(fe, j)); PyObject *num = PySequence_Fast_GET_ITEM(fe, j);
if (!PyNumber_Check(num)) {
return failmsg("Sequence must contain numbers", name);
}
*pdst++ = PyInt_AsLong(num);
} }
Py_DECREF(fe); Py_DECREF(fe);
} }
@ -1755,7 +1777,7 @@ static int convert_to_cvarrseq(PyObject *o, cvarrseq *dst, const char *name = "n
dst->mat = mt; dst->mat = mt;
return 1; return 1;
} else { } else {
return convert_to_CvArr(o, &(dst->mat), name); return failmsg("Argument '%s' must be CvSeq, CvArr, or a sequence of numbers");
} }
} }