Merged few small fixes from 2.4 branch

2012-06-30 13:36:27 +00:00
parent cdad4ac7c9
commit 27c23b557c
3 changed files with 15 additions and 8 deletions
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -5202,13 +5202,11 @@ string FileStorage::releaseAndGetString()
    string buf;
    if( fs.obj && fs.obj->outbuf )
        icvClose(fs.obj, &buf);
-
-    fs.release();
-    structs.clear();
-    state = UNDEFINED;
-    return buf;
-}
-
+    
+    release();
+	return buf;
+}    
+    
 FileNode FileStorage::root(int streamidx) const
 {
    return isOpened() ? FileNode(fs, cvGetRootFileNode(fs, streamidx)) : FileNode();