Merge branch 2.4

2026-07-29 15:23:05 +04:00 · 2012-12-21 17:58:48 +04:00
parent 3edf7c5386 ffdbddd6b1
commit 962884cdec
35 changed files with 1091 additions and 191 deletions
@@ -5170,6 +5170,7 @@ void FileStorage::release()
 string FileStorage::releaseAndGetString()
 {
    string buf;
+    buf.reserve(16); // HACK: Work around for compiler bug
    if( fs.obj && fs.obj->outbuf )
        icvClose(fs.obj, &buf);