From bb3d14e1a0be6b8f794b175ac32e7a02411770da Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 28 Nov 2012 21:53:39 +0400 Subject: [PATCH] Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied. --- modules/highgui/src/cap_libv4l.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp index b1be7f2e86..01b611c66c 100644 --- a/modules/highgui/src/cap_libv4l.cpp +++ b/modules/highgui/src/cap_libv4l.cpp @@ -1008,10 +1008,6 @@ static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index) return NULL; } - /* set the default size */ - capture->width = DEFAULT_V4L_WIDTH; - capture->height = DEFAULT_V4L_HEIGHT; - #ifdef USE_TEMP_BUFFER capture->buffers[MAX_V4L_BUFFERS].start = NULL; #endif @@ -1035,6 +1031,9 @@ static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index) the standard set of cv calls promoting transparency. "Vector Table" insertion. */ capture->FirstCapture = 1; + /* set the default size */ + capture->width = DEFAULT_V4L_WIDTH; + capture->height = DEFAULT_V4L_HEIGHT; if (_capture_V4L2 (capture, deviceName) == -1) { icvCloseCAM_V4L(capture);