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

fixed tickets #1117 and #954

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-06-10 17:22:33 +00:00
parent 1ebdfa4992
commit f9fc180e1a
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/python/src1/cv.cpp
View File

@@ -2860,10 +2860,6 @@ static PyObject *fromarray(PyObject *o, int allowND)
type = CV_16SC1;
else if (pai->itemsize == 4)
type = CV_32SC1;
else if (pai->itemsize == 8) {
PyErr_SetString(PyExc_TypeError, "OpenCV cannot handle 64-bit integer arrays");
return NULL;
}
break;
case 'u':
@@ -2879,9 +2875,12 @@ static PyObject *fromarray(PyObject *o, int allowND)
else if (pai->itemsize == 8)
type = CV_64FC1;
break;
}
if (type == -1) {
PyErr_SetString(PyExc_TypeError, "the array type is not supported by OpenCV");
return NULL;
}
assert(type != -1);
if (!allowND) {
cvmat_t *m = PyObject_NEW(cvmat_t, &cvmat_Type);