Skip to content

O
opencv
Commit 3d92d4c0 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fixed compile errors on Ubuntu 11.04

parent 675aaea4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/highgui/src/cap.cpp
View file @ 3d92d4c0
...@@ -173,7 +173,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index) ...@@ -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;
......
modules/highgui/src/cap_v4l.cpp
View file @ 3d92d4c0
...@@ -202,7 +202,7 @@ make & enjoy! ...@@ -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))
......
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