Skip to content

O
opencv
Commit d15d9f55 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #8514 from paroj:v4lretval

parents e93aa158 d92d82d1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/videoio/src/cap_v4l.cpp
View file @ d15d9f55
...@@ -1772,6 +1772,7 @@ static int icvSetPropertyCAM_V4L( CvCaptureCAM_V4L* capture, ...@@ -1772,6 +1772,7 @@ static int icvSetPropertyCAM_V4L( CvCaptureCAM_V4L* capture,
switch (property_id) { switch (property_id) {
case CV_CAP_PROP_FRAME_WIDTH: case CV_CAP_PROP_FRAME_WIDTH:
width = cvRound(value); width = cvRound(value);
retval = width != 0;
if(width !=0 && height != 0) { if(width !=0 && height != 0) {
capture->width = width; capture->width = width;
capture->height = height; capture->height = height;
...@@ -1781,6 +1782,7 @@ static int icvSetPropertyCAM_V4L( CvCaptureCAM_V4L* capture, ...@@ -1781,6 +1782,7 @@ static int icvSetPropertyCAM_V4L( CvCaptureCAM_V4L* capture,
break; break;
case CV_CAP_PROP_FRAME_HEIGHT: case CV_CAP_PROP_FRAME_HEIGHT:
height = cvRound(value); height = cvRound(value);
retval = height != 0;
if(width !=0 && height != 0) { if(width !=0 && height != 0) {
capture->width = width; capture->width = width;
capture->height = height; capture->height = height;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment