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

#489, Forbid transposed matrices in fromarray()

Browse Source
This commit is contained in:
James Bowman
2010-07-23 17:04:06 +00:00
parent f2353b8523
commit d10b3c8665
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/python/cv.cpp
View File

@@ -390,6 +390,18 @@ static PyObject *cvmat_repr(PyObject *self)
char *d = str + strlen(str); char *d = str + strlen(str);
sprintf(d, "type=%08x ", m->type); sprintf(d, "type=%08x ", m->type);
d += strlen(d); d += strlen(d);
switch (CV_MAT_DEPTH(m->type)) {
case CV_8U: strcpy(d, "8U"); break;
case CV_8S: strcpy(d, "8S"); break;
case CV_16U: strcpy(d, "16U"); break;
case CV_16S: strcpy(d, "16S"); break;
case CV_32S: strcpy(d, "32S"); break;
case CV_32F: strcpy(d, "32F"); break;
case CV_64F: strcpy(d, "64F"); break;
}
d += strlen(d);
sprintf(d, "C%d ", CV_MAT_CN(m->type));
d += strlen(d);
sprintf(d, "rows=%d ", m->rows); sprintf(d, "rows=%d ", m->rows);
d += strlen(d); d += strlen(d);
sprintf(d, "cols=%d ", m->cols); sprintf(d, "cols=%d ", m->cols);
@@ -2799,6 +2811,9 @@ static PyObject *fromarray(PyObject *o, int allowND)
if (!allowND) { if (!allowND) {
cvmat_t *m = PyObject_NEW(cvmat_t, &cvmat_Type); cvmat_t *m = PyObject_NEW(cvmat_t, &cvmat_Type);
if (pai->nd == 2) { if (pai->nd == 2) {
if (pai->strides[1] != pai->itemsize) {
return (PyObject*)failmsg("cv.fromarray array can only accept arrays with contiguous data");
}
ERRWRAP(m->a = cvCreateMatHeader(pai->shape[0], pai->shape[1], type)); ERRWRAP(m->a = cvCreateMatHeader(pai->shape[0], pai->shape[1], type));
m->a->step = pai->strides[0]; m->a->step = pai->strides[0];
} else if (pai->nd == 3) { } else if (pai->nd == 3) {