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

fixed compile errors on Ubuntu 11.04

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-04-28 14:08:03 +00:00
parent 675aaea46f
commit 3d92d4c0bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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_CAMV4L) && defined (HAVE_CAMV4L2)
capture = cvCreateCameraCapture_V4L (index); capture = cvCreateCameraCapture_V4L (index);
if (capture) if (capture)
return capture; return capture;

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

@ -202,7 +202,7 @@ make & enjoy!
#include "precomp.hpp" #include "precomp.hpp"
#if !defined WIN32 && (defined HAVE_CAMV4L || defined HAVE_CAMV4L2) #if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
#define CLEAR(x) memset (&(x), 0, sizeof (x)) #define CLEAR(x) memset (&(x), 0, sizeof (x))