Merge branch 2.4

This commit is contained in:
Andrey Kamaev
2012-12-21 17:58:48 +04:00
35 changed files with 1091 additions and 191 deletions

View File

@@ -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);