From ad52dd37a938c12469bf6c654f30eac69aa76253 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Thu, 12 Sep 2013 12:58:10 +0400 Subject: [PATCH] Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186" This reverts commit 41b8479d039bb0ecc36627ae50349b6fcd5e16e3, reversing changes made to 531471b0aa4b4e8f9fcab8282d5cbe895b77e6e0. Reason: breaks the build. --- modules/highgui/src/cap_v4l.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp index 49432c984..045c6f889 100644 --- a/modules/highgui/src/cap_v4l.cpp +++ b/modules/highgui/src/cap_v4l.cpp @@ -1236,10 +1236,10 @@ static int read_frame_v4l2(CvCaptureCAM_V4L* capture) { //set timestamp in capture struct to be timestamp of most recent frame capture->timestamp = buf.timestamp; - return 2; + return 1; } -static int mainloop_v4l2(CvCaptureCAM_V4L* capture) { +static void mainloop_v4l2(CvCaptureCAM_V4L* capture) { unsigned int count; count = 1; @@ -1273,13 +1273,8 @@ static int mainloop_v4l2(CvCaptureCAM_V4L* capture) { break; } - int readresult = read_frame_v412(capture); - if (readresult == 2){ - return 0; - } - if (readresult){ - return 1; - } + if (read_frame_v4l2 (capture)) + break; } } } @@ -1359,10 +1354,7 @@ static int icvGrabFrameCAM_V4L(CvCaptureCAM_V4L* capture) { { // skip first frame. it is often bad -- this is unnotied in traditional apps, // but could be fatal if bad jpeg is enabled - if(!mainloop_v4l2(capture)){ - fprintf( stderr, "HIGHGUI ERROR: V4L: Could not capture image.\n"); - return 0; - } + mainloop_v4l2(capture); } #endif @@ -1374,10 +1366,9 @@ static int icvGrabFrameCAM_V4L(CvCaptureCAM_V4L* capture) { if (V4L2_SUPPORT == 1) { - if(!mainloop_v4l2(capture)){ - fprintf( stderr, "HIGHGUI ERROR: V4L: Could not capture image.\n"); - return 0; - } + + mainloop_v4l2(capture); + } #endif /* HAVE_CAMV4L2 */ #if defined(HAVE_CAMV4L) && defined(HAVE_CAMV4L2)