fixed compile errors on Ubuntu 11.04

3d92d4c0 · Vadim Pisarevsky · 675aaea4 · 3d92d4c0 · 3d92d4c0
Commit 3d92d4c0 authored Apr 28, 2011 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cap.cpp modules/highgui/src/cap.cpp +1 -1

cap_v4l.cpp modules/highgui/src/cap_v4l.cpp +1 -1

No files found.
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -173,7 +173,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
            if (capture)
                return capture;
        #endif
-        #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2)
+        #if defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2)
            capture = cvCreateCameraCapture_V4L (index);
            if (capture)
                return capture;

--- a/modules/highgui/src/cap_v4l.cpp
+++ b/modules/highgui/src/cap_v4l.cpp
@@ -202,7 +202,7 @@ make & enjoy!

 #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))