fixed ticket #983

14 years ago · 22927ff121
parent 30020a7350
commit 22927ff121
1 changed files with 3 additions and 2 deletions
--- a/modules/python/src1/cv.cpp
+++ b/modules/python/src1/cv.cpp
@ -2616,11 +2616,12 @@ static PyObject *FROM_CvRNG(CvRNG r)

 static PyObject *FROM_generic(generic r)
 {
-  CvTypeInfo* t = cvTypeOf(r);
  if (r == NULL) {
    failmsg("OpenCV returned 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);
  else if (strcmp(t->type_name, "opencv-matrix") == 0)
    return FROM_CvMat((CvMat*)r);