Merge pull request #970 from asmorkalov:dshow_valid_check_fix

12 years ago · 55e83b8d18
parent 3016986833 956d8027ef
commit 55e83b8d18
1 changed files with 4 additions and 2 deletions
--- a/modules/highgui/src/cap_dshow.cpp
+++ b/modules/highgui/src/cap_dshow.cpp
@ -3195,8 +3195,10 @@ IplImage* CvCaptureCAM_DShow::retrieveFrame(int)
        frame = cvCreateImage( cvSize(w,h), 8, 3 );
    }

-    VI.getPixels( index, (uchar*)frame->imageData, false, true );
-    return frame;
+    if (VI.getPixels( index, (uchar*)frame->imageData, false, true ))
+        return frame;
+    else
+        return NULL;
 }

 double CvCaptureCAM_DShow::getProperty( int property_id )