Merge pull request #8514 from paroj:v4lretval

d15d9f55 · Alexander Alekhin · e93aa158 · d92d82d1 · d15d9f55
Commit d15d9f55 authored Apr 04, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

cap_v4l.cpp modules/videoio/src/cap_v4l.cpp +2 -0

No files found.
--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp
@@ -1772,6 +1772,7 @@ static int icvSetPropertyCAM_V4L( CvCaptureCAM_V4L* capture,
    switch (property_id) {
    case CV_CAP_PROP_FRAME_WIDTH:
        width = cvRound(value);
+        retval = width != 0;
        if(width !=0 && height != 0) {
            capture->width = width;
            capture->height = height;
@@ -1781,6 +1782,7 @@ static int icvSetPropertyCAM_V4L( CvCaptureCAM_V4L* capture,
        break;
    case CV_CAP_PROP_FRAME_HEIGHT:
        height = cvRound(value);
+        retval = height != 0;
        if(width !=0 && height != 0) {
            capture->width = width;
            capture->height = height;