Merge pull request #970 from asmorkalov:dshow_valid_check_fix

55e83b8d · Roman Donchenko · OpenCV Buildbot · 30169868 · 956d8027 · 55e83b8d
Commit 55e83b8d authored Jun 10, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jun 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cap_dshow.cpp modules/highgui/src/cap_dshow.cpp +4 -2

No files found.
--- 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 )