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

propagated fixes in docs and cap_dshow to trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-01 09:39:22 +00:00
parent 382e154cfd
commit 6c8a2b8888
10 changed files with 167 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/core/doc/old_xml_yaml_persistence.rst
View File

@@ -299,6 +299,7 @@ Then, it is possible to get hashed "x" and "y" pointers to speed up decoding of
cvReleaseFileStorage( &fs );
return 0;
}
..
Please note that whatever method of accessing a map you are using, it is
@@ -620,20 +621,21 @@ Starts the next stream.
The function finishes the currently written stream and starts the next stream. In the case of XML the file with multiple streams looks like this: ::
<opencv_storage>
<!-- stream #1 data -->
</opencv_storage>
<opencv_storage>
<!-- stream #2 data -->
</opencv_storage>
...
<opencv_storage>
<!-- stream #1 data -->
</opencv_storage>
<opencv_storage>
<!-- stream #2 data -->
</opencv_storage>
...
The a YAML file will look like this:
%YAML:1.0
# stream #1 data
...
---
# stream #2 data
The a YAML file will look like this: ::
%YAML:1.0
# stream #1 data
...
---
# stream #2 data
This is useful for concatenating files or for resuming the writing process.

2
modules/core/doc/utility_and_system_functions_and_macros.rst
View File

@@ -264,7 +264,7 @@ Deallocates a memory buffer.
:param pptr: Double pointer to the allocated buffer
The function deallocates the buffer allocated with :ocv:func:`fastMalloc` . If NULL pointer is passed, the function does nothing. C version of the function clears the pointer *pptr to avoid problems with double memory deallocation.
The function deallocates the buffer allocated with :ocv:func:`fastMalloc` . If NULL pointer is passed, the function does nothing. C version of the function clears the pointer ``*pptr`` to avoid problems with double memory deallocation.
format