Merge pull request #1109 from nikman-ru:cap_reuse_24x

09ec483d · Roman Donchenko · OpenCV Buildbot · 18f1964f · 05aeb708 · 09ec483d
Commit 09ec483d authored Jul 12, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jul 12, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cap.cpp modules/highgui/src/cap.cpp +2 -2

No files found.
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -489,14 +489,14 @@ VideoCapture::~VideoCapture()

 bool VideoCapture::open(const string& filename)
 {
-    if (!isOpened())
+    if (isOpened()) release();
    cap = cvCreateFileCapture(filename.c_str());
    return isOpened();
 }

 bool VideoCapture::open(int device)
 {
-    if (!isOpened())
+    if (isOpened()) release();
    cap = cvCreateCameraCapture(device);
    return isOpened();
 }