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

make ubuntu 11.04 compile with libv4l

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-12 11:40:42 +00:00
parent 23a369b27e
commit 138b9724d8
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cvconfig.h.cmake
View File

@ -19,6 +19,9 @@
/* V4L2 capturing support */ /* V4L2 capturing support */
#cmakedefine HAVE_CAMV4L2 #cmakedefine HAVE_CAMV4L2
/* V4L/V4L2 capturing support via libv4l */
#cmakedefine HAVE_LIBV4L
/* Carbon windowing environment */ /* Carbon windowing environment */
#cmakedefine HAVE_CARBON #cmakedefine HAVE_CARBON

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

@ -173,7 +173,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
if (capture) if (capture)
return capture; return capture;
#endif #endif
#if defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2) #if defined HAVE_LIBV4L || (defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2))
capture = cvCreateCameraCapture_V4L (index); capture = cvCreateCameraCapture_V4L (index);
if (capture) if (capture)
return capture; return capture;

6
modules/highgui/src/cap_libv4l.cpp
View File

@ -224,7 +224,7 @@ make & enjoy!
#include "highgui.h" #include "highgui.h"
#include "precomp.hpp" #include "precomp.hpp"
#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 #if !defined WIN32 && defined HAVE_LIBV4L
#define CLEAR(x) memset (&(x), 0, sizeof (x)) #define CLEAR(x) memset (&(x), 0, sizeof (x))
@ -241,8 +241,12 @@ make & enjoy!
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef HAVE_CAMV4L
#include <linux/videodev.h> #include <linux/videodev.h>
#endif
#ifdef HAVE_CAMV4L2
#include <linux/videodev2.h> #include <linux/videodev2.h>
#endif
#include <libv4l1.h> #include <libv4l1.h>
#include <libv4l2.h> #include <libv4l2.h>