Merge pull request #1104 from nikman-ru:cap_reuse

2013-07-11 11:52:22 +04:00
parent decd0c753a 21211308d0
commit 75b86c9706
1 changed files with 2 additions and 2 deletions
--- 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();
 }