Merge pull request #1104 from nikman-ru:cap_reuse

75b86c97 · Andrey Pavlenko · OpenCV Buildbot · decd0c75 · 21211308 · 75b86c97
Commit 75b86c97 authored Jul 11, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Jul 11, 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
@@ -490,14 +490,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();
 }