merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -493,9 +493,14 @@ VideoWriter::VideoWriter(const string& filename, int fourcc, double fps, Size fr
    open(filename, fourcc, fps, frameSize, isColor);
 }

-VideoWriter::~VideoWriter()
+void VideoWriter::release()
 {
    writer.release();
+}    
+    
+VideoWriter::~VideoWriter()
+{
+    release();
 }
    
 bool VideoWriter::open(const string& filename, int fourcc, double fps, Size frameSize, bool isColor)