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

added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor.

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-08-11 17:59:30 +00:00
parent d58459ccdd
commit bd0d8429ee
8 changed files with 1152 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/highgui/src/cap.cpp
View File

@@ -132,6 +132,9 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
#endif
#ifdef HAVE_ANDROID_NATIVE_CAMERA
CV_CAP_ANDROID,
#endif
#ifdef HAVE_XIMEA
CV_CAP_XIAPI,
#endif
-1
};
@@ -238,36 +241,43 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
#ifdef HAVE_UNICAP
case CV_CAP_UNICAP:
capture = cvCreateCameraCapture_Unicap (index);
if (capture)
return capture;
capture = cvCreateCameraCapture_Unicap (index);
if (capture)
return capture;
break;
#endif
#ifdef HAVE_PVAPI
case CV_CAP_PVAPI:
capture = cvCreateCameraCapture_PvAPI (index);
if (capture)
return capture;
capture = cvCreateCameraCapture_PvAPI (index);
if (capture)
return capture;
break;
#endif
#ifdef HAVE_OPENNI
case CV_CAP_OPENNI:
capture = cvCreateCameraCapture_OpenNI (index);
if (capture)
return capture;
capture = cvCreateCameraCapture_OpenNI (index);
if (capture)
return capture;
break;
#endif
#ifdef HAVE_ANDROID_NATIVE_CAMERA
#ifdef HAVE_ANDROID_NATIVE_CAMERA
case CV_CAP_ANDROID:
capture = cvCreateCameraCapture_Android (index);
if (capture)
return capture;
capture = cvCreateCameraCapture_Android (index);
if (capture)
return capture;
break;
#endif
#ifdef HAVE_XIMEA
case CV_CAP_XIAPI:
capture = cvCreateCameraCapture_Ximea (index);
if (capture)
return capture;
break;
#endif
}
}