generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged few small fixes from 2.4 branch

Browse Source
This commit is contained in:
Andrey Kamaev 2012-06-30 13:36:27 +00:00
parent cdad4ac7c9
commit 27c23b557c
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/doc/xml_yaml_persistence.rst
View File

@ -201,6 +201,15 @@ Closes the file and releases all the memory buffers.
.. ocv:function:: void FileStorage::release() .. ocv:function:: void FileStorage::release()
Call this method after all I/O operations with the storage are finished.
FileStorage::releaseAndGetString
--------------------------------
Closes the file and releases all the memory buffers.
.. ocv:function:: string FileStorage::releaseAndGetString()
Call this method after all I/O operations with the storage are finished. If the storage was opened for writing data and ``FileStorage::WRITE`` was specified Call this method after all I/O operations with the storage are finished. If the storage was opened for writing data and ``FileStorage::WRITE`` was specified

12
modules/core/src/persistence.cpp
View File

@ -5202,13 +5202,11 @@ string FileStorage::releaseAndGetString()
string buf; string buf;
if( fs.obj && fs.obj->outbuf ) if( fs.obj && fs.obj->outbuf )
icvClose(fs.obj, &buf); icvClose(fs.obj, &buf);
fs.release(); release();
structs.clear(); return buf;
state = UNDEFINED; }
return buf;
}
FileNode FileStorage::root(int streamidx) const FileNode FileStorage::root(int streamidx) const
{ {
return isOpened() ? FileNode(fs, cvGetRootFileNode(fs, streamidx)) : FileNode(); return isOpened() ? FileNode(fs, cvGetRootFileNode(fs, streamidx)) : FileNode();

2
modules/highgui/src/cap_dshow.cpp
View File

@ -3278,7 +3278,7 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
case CV_CAP_PROP_FPS: case CV_CAP_PROP_FPS:
int fps = cvRound(value); int fps = cvRound(value);
if (fps != VI.getFPS(0)) if (fps != VI.getFPS(index))
{ {
VI.stopDevice(index); VI.stopDevice(index);
VI.setIdealFramerate(index,fps); VI.setIdealFramerate(index,fps);