generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #194 from asmorkalov/v4l_fix

Browse Source 
Patch #2323 applied
This commit is contained in:
Andrey Kamaev 2012-11-29 01:27:34 -08:00
commit 64bed2060a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/cap_libv4l.cpp
View File

@ -1008,10 +1008,6 @@ static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index)
return NULL; return NULL;
} }
/* set the default size */
capture->width = DEFAULT_V4L_WIDTH;
capture->height = DEFAULT_V4L_HEIGHT;
#ifdef USE_TEMP_BUFFER #ifdef USE_TEMP_BUFFER
capture->buffers[MAX_V4L_BUFFERS].start = NULL; capture->buffers[MAX_V4L_BUFFERS].start = NULL;
#endif #endif
@ -1035,6 +1031,9 @@ static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index)
the standard set of cv calls promoting transparency. "Vector Table" insertion. */ the standard set of cv calls promoting transparency. "Vector Table" insertion. */
capture->FirstCapture = 1; capture->FirstCapture = 1;
/* set the default size */
capture->width = DEFAULT_V4L_WIDTH;
capture->height = DEFAULT_V4L_HEIGHT;
if (_capture_V4L2 (capture, deviceName) == -1) { if (_capture_V4L2 (capture, deviceName) == -1) {
icvCloseCAM_V4L(capture); icvCloseCAM_V4L(capture);