mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoio: remove using of HAVE_CAMV4L

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-12 18:53:19 +00:00
parent ab65b9745b
commit e0e828ef5c
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/templates/cvconfig.h.in
View File

@ -25,9 +25,6 @@
/* AVFoundation video libraries */ /* AVFoundation video libraries */
#cmakedefine HAVE_AVFOUNDATION #cmakedefine HAVE_AVFOUNDATION
/* V4L capturing support */
#cmakedefine HAVE_CAMV4L
/* V4L2 capturing support */ /* V4L2 capturing support */
#cmakedefine HAVE_CAMV4L2 #cmakedefine HAVE_CAMV4L2

2
modules/videoio/src/cap_dc1394.cpp
View File

@ -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: 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 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. Now it should be possible to use videoio camera functions, works for me.

6
modules/videoio/src/videoio_registry.cpp
View File

@ -82,8 +82,6 @@ static const struct VideoBackendInfo builtin_backends[] =
// Linux, some Unix // Linux, some Unix
#if defined HAVE_CAMV4L2 #if defined HAVE_CAMV4L2
DECLARE_BACKEND(CAP_V4L2, "V4L2", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_V4L2, "V4L2", MODE_CAPTURE_ALL),
#elif defined HAVE_CAMV4L
DECLARE_BACKEND(CAP_V4L, "V4L", MODE_CAPTURE_ALL),
#elif defined HAVE_VIDEOIO #elif defined HAVE_VIDEOIO
DECLARE_BACKEND(CAP_V4L, "V4L_BSD", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_V4L, "V4L_BSD", MODE_CAPTURE_ALL),
#endif #endif
@ -436,7 +434,7 @@ void VideoCapture_create(CvCapture*& capture, Ptr<IVideoCapture>& icap, VideoCap
TRY_OPEN(createGPhoto2Capture(index)); TRY_OPEN(createGPhoto2Capture(index));
break; break;
#endif #endif
#if defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO #if defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO
case CAP_V4L: case CAP_V4L:
TRY_OPEN_LEGACY(cvCreateCameraCapture_V4L(index)) TRY_OPEN_LEGACY(cvCreateCameraCapture_V4L(index))
break; break;
@ -500,7 +498,7 @@ void VideoCapture_create(CvCapture*& capture, Ptr<IVideoCapture>& icap, VideoCap
default: default:
CV_LOG_WARNING(NULL, "VideoCapture(filename=" << filename << ") was built without support of requested backendID=" << (int)api); CV_LOG_WARNING(NULL, "VideoCapture(filename=" << filename << ") was built without support of requested backendID=" << (int)api);
break; break;
#if defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO #if defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO
case CAP_V4L: case CAP_V4L:
TRY_OPEN_LEGACY(cvCreateCameraCapture_V4L(filename.c_str())) TRY_OPEN_LEGACY(cvCreateCameraCapture_V4L(filename.c_str()))
break; break;