fixed compile errors on Ubuntu 11.04

14 years ago · 3d92d4c0bc
parent 675aaea46f
commit 3d92d4c0bc
2 changed files with 2 additions and 2 deletions
--- 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))