Skip to content

O
opencv
Commit 22927ff1 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fixed ticket #983

parent 30020a73
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/python/src1/cv.cpp
View file @ 22927ff1
...@@ -2616,11 +2616,12 @@ static PyObject *FROM_CvRNG(CvRNG r) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment