mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoio(v4l): eliminate global variable

Browse Source
This commit is contained in:
Alexander Alekhin 2018-05-31 14:11:47 +03:00
parent 83d915eca1
commit c94fe0c7e7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/videoio/src/cap_v4l.cpp
View File

@ -265,8 +265,6 @@ struct buffer
size_t length; size_t length;
}; };
static unsigned int n_buffers = 0;
struct CvCaptureCAM_V4L CV_FINAL : public CvCapture struct CvCaptureCAM_V4L CV_FINAL : public CvCapture
{ {
int deviceHandle; int deviceHandle;
@ -693,7 +691,7 @@ try_again:
} }
} }
for (n_buffers = 0; n_buffers < capture->req.count; ++n_buffers) for (unsigned int n_buffers = 0; n_buffers < capture->req.count; ++n_buffers)
{ {
v4l2_buffer buf = v4l2_buffer(); v4l2_buffer buf = v4l2_buffer();
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@ -1835,13 +1833,13 @@ static void icvCloseCAM_V4L( CvCaptureCAM_V4L* capture ){
perror ("Unable to stop the stream"); perror ("Unable to stop the stream");
} }
for (unsigned int n_buffers_ = 0; n_buffers_ < MAX_V4L_BUFFERS; ++n_buffers_) for (unsigned int n_buffers = 0; n_buffers < MAX_V4L_BUFFERS; ++n_buffers)
{ {
if (capture->buffers[n_buffers_].start) { if (capture->buffers[n_buffers].start) {
if (-1 == munmap (capture->buffers[n_buffers_].start, capture->buffers[n_buffers_].length)) { if (-1 == munmap (capture->buffers[n_buffers].start, capture->buffers[n_buffers].length)) {
perror ("munmap"); perror ("munmap");
} else { } else {
capture->buffers[n_buffers_].start = 0; capture->buffers[n_buffers].start = 0;
} }
} }
} }