mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed ticket #983

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-06-13 21:20:38 +00:00
parent 30020a7350
commit 22927ff121
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2616,11 +2616,12 @@ static PyObject *FROM_CvRNG(CvRNG r)
static PyObject *FROM_generic(generic r) static PyObject *FROM_generic(generic r)
{ {
CvTypeInfo* t = cvTypeOf(r);
if (r == NULL) { if (r == NULL) {
failmsg("OpenCV returned NULL"); failmsg("OpenCV returned NULL");
return NULL; return NULL;
} if (strcmp(t->type_name, "opencv-image") == 0) }
CvTypeInfo* t = cvTypeOf(r);
if (strcmp(t->type_name, "opencv-image") == 0)
return FROM_IplImagePTR((IplImage*)r); return FROM_IplImagePTR((IplImage*)r);
else if (strcmp(t->type_name, "opencv-matrix") == 0) else if (strcmp(t->type_name, "opencv-matrix") == 0)
return FROM_CvMat((CvMat*)r); return FROM_CvMat((CvMat*)r);