From e78373f4b8392ba3a5a059911bd23bc4ec667c61 Mon Sep 17 00:00:00 2001 From: Filipe Almeida Date: Sat, 19 Jun 2010 14:34:44 +0000 Subject: [PATCH] V4L2: removed setting device control values to initial values on capture release --- modules/highgui/src/cap_libv4l.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp index bbbe897640..04b07bb744 100644 --- a/modules/highgui/src/cap_libv4l.cpp +++ b/modules/highgui/src/cap_libv4l.cpp @@ -505,10 +505,11 @@ static void v4l2_free_ranges(CvCaptureCAM_V4L* capture) { if (capture->v4l2_ctrl_ranges != NULL) { for (i = 0; i < capture->v4l2_ctrl_count; i++) { /* Return device to initial values: */ - double value = (capture->v4l2_ctrl_ranges[i]->initial_value == 0)?0.0:((float)capture->v4l2_ctrl_ranges[i]->initial_value - capture->v4l2_ctrl_ranges[i]->minimum) / (capture->v4l2_ctrl_ranges[i]->maximum - capture->v4l2_ctrl_ranges[i]->minimum); + /* double value = (capture->v4l2_ctrl_ranges[i]->initial_value == 0)?0.0:((float)capture->v4l2_ctrl_ranges[i]->initial_value - capture->v4l2_ctrl_ranges[i]->minimum) / (capture->v4l2_ctrl_ranges[i]->maximum - capture->v4l2_ctrl_ranges[i]->minimum); */ /* Return device to default values: */ /* double value = (capture->v4l2_ctrl_ranges[i]->default_value == 0)?0.0:((float)capture->v4l2_ctrl_ranges[i]->default_value - capture->v4l2_ctrl_ranges[i]->minimum + 1) / (capture->v4l2_ctrl_ranges[i]->maximum - capture->v4l2_ctrl_ranges[i]->minimum); */ - icvSetPropertyCAM_V4L(capture, capture->v4l2_ctrl_ranges[i]->ctrl_id, value); + + /* icvSetPropertyCAM_V4L(capture, capture->v4l2_ctrl_ranges[i]->ctrl_id, value); */ free(capture->v4l2_ctrl_ranges[i]); } }