HAVE_WIN32UI and HAVE_VFW checks and defines added.

2013-03-27 08:03:51 -07:00
parent de95a2b278
commit 09bc99a0c0
16 changed files with 70 additions and 33 deletions
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -200,7 +200,6 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
             capture = cvCreateCameraCapture_DShow (index);
             if (capture)
                 return capture;
-            return NULL;
            break;
 #endif