From e0e828ef5c3579c033aa3588c995aabd2028ccc1 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 12 Nov 2018 18:53:19 +0000 Subject: [PATCH] videoio: remove using of HAVE_CAMV4L --- cmake/templates/cvconfig.h.in | 3 --- modules/videoio/src/cap_dc1394.cpp | 2 +- modules/videoio/src/videoio_registry.cpp | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmake/templates/cvconfig.h.in b/cmake/templates/cvconfig.h.in index c395000..60db836 100644 --- a/cmake/templates/cvconfig.h.in +++ b/cmake/templates/cvconfig.h.in @@ -25,9 +25,6 @@ /* AVFoundation video libraries */ #cmakedefine HAVE_AVFOUNDATION -/* V4L capturing support */ -#cmakedefine HAVE_CAMV4L - /* V4L2 capturing support */ #cmakedefine HAVE_CAMV4L2 diff --git a/modules/videoio/src/cap_dc1394.cpp b/modules/videoio/src/cap_dc1394.cpp index 368bf3a..4da4198 100644 --- a/modules/videoio/src/cap_dc1394.cpp +++ b/modules/videoio/src/cap_dc1394.cpp @@ -28,7 +28,7 @@ Install dc1394 raw1394 - coriander should work with your camera The build is controlled by the following entries in the videoio Makefile: libvideoio_la_LIBADD = -L/usr/X11R6/lib -lXm -lMrm -lUil -lpng -ljpeg -lz -ltiff -lavcodec -lraw1394 -ldc1394_control -DEFS = -DHAVE_CONFIG_H -DHAVE_DC1394 HAVE_CAMV4L +DEFS = -DHAVE_CONFIG_H -DHAVE_DC1394 Now it should be possible to use videoio camera functions, works for me. diff --git a/modules/videoio/src/videoio_registry.cpp b/modules/videoio/src/videoio_registry.cpp index b5a5f7f..ee6fab1 100644 --- a/modules/videoio/src/videoio_registry.cpp +++ b/modules/videoio/src/videoio_registry.cpp @@ -82,8 +82,6 @@ static const struct VideoBackendInfo builtin_backends[] = // Linux, some Unix #if defined HAVE_CAMV4L2 DECLARE_BACKEND(CAP_V4L2, "V4L2", MODE_CAPTURE_ALL), -#elif defined HAVE_CAMV4L - DECLARE_BACKEND(CAP_V4L, "V4L", MODE_CAPTURE_ALL), #elif defined HAVE_VIDEOIO DECLARE_BACKEND(CAP_V4L, "V4L_BSD", MODE_CAPTURE_ALL), #endif @@ -436,7 +434,7 @@ void VideoCapture_create(CvCapture*& capture, Ptr& icap, VideoCap TRY_OPEN(createGPhoto2Capture(index)); break; #endif -#if defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO +#if defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO case CAP_V4L: TRY_OPEN_LEGACY(cvCreateCameraCapture_V4L(index)) break; @@ -500,7 +498,7 @@ void VideoCapture_create(CvCapture*& capture, Ptr& icap, VideoCap default: CV_LOG_WARNING(NULL, "VideoCapture(filename=" << filename << ") was built without support of requested backendID=" << (int)api); break; -#if defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO +#if defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO case CAP_V4L: TRY_OPEN_LEGACY(cvCreateCameraCapture_V4L(filename.c_str())) break; -- 2.7.4