From 0d821f04fd7520aeb951d84a6817064dd2348ef9 Mon Sep 17 00:00:00 2001 From: "alexander barakin (aka sash-kan)" Date: Sat, 6 Jun 2015 14:41:00 +0300 Subject: [PATCH] fix icvCloseCAM_V4L wrong order of code blocks this patch fixes bug http://code.opencv.org/issues/2822 . based on disussion (in russian): http://ru.stackoverflow.com/a/428398/178576 Signed-off-by: alexander barakin (aka sash-kan) --- modules/videoio/src/cap_v4l.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/videoio/src/cap_v4l.cpp b/modules/videoio/src/cap_v4l.cpp index 791f0a234..a879de7d5 100644 --- a/modules/videoio/src/cap_v4l.cpp +++ b/modules/videoio/src/cap_v4l.cpp @@ -2824,21 +2824,8 @@ static void icvCloseCAM_V4L( CvCaptureCAM_V4L* capture ){ { #ifdef HAVE_CAMV4L2 - if (V4L2_SUPPORT == 0) + if (V4L2_SUPPORT == 1) #endif /* HAVE_CAMV4L2 */ -#ifdef HAVE_CAMV4L - { - - if (capture->mmaps) - free(capture->mmaps); - if (capture->memoryMap) - munmap(capture->memoryMap, capture->memoryBuffer.size); - - } -#endif /* HAVE_CAMV4L */ -#if defined(HAVE_CAMV4L) && defined(HAVE_CAMV4L2) - else -#endif /* HAVE_CAMV4L && HAVE_CAMV4L2 */ #ifdef HAVE_CAMV4L2 { capture->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -2860,6 +2847,19 @@ static void icvCloseCAM_V4L( CvCaptureCAM_V4L* capture ){ } } #endif /* HAVE_CAMV4L2 */ +#if defined(HAVE_CAMV4L) && defined(HAVE_CAMV4L2) + else +#endif /* HAVE_CAMV4L && HAVE_CAMV4L2 */ +#ifdef HAVE_CAMV4L + { + + if (capture->mmaps) + free(capture->mmaps); + if (capture->memoryMap) + munmap(capture->memoryMap, capture->memoryBuffer.size); + + } +#endif /* HAVE_CAMV4L */ if (capture->deviceHandle != -1) close(capture->deviceHandle);