potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2022-02-11 17:32:37 +00:00
parent 76aff84788 1620a1e014
commit 19926e2979
46 changed files with 323 additions and 2889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/persistence.hpp
+2 -2
View File
@@ -309,8 +309,8 @@ public:
READ = 0, //!< value, open the file for reading
WRITE = 1, //!< value, open the file for writing
APPEND = 2, //!< value, open the file for appending
MEMORY = 4, //!< flag, read data from source or write data to the internal buffer (which is
//!< returned by FileStorage::release)
MEMORY = 4, /**< flag, read data from source or write data to the internal buffer (which is
returned by FileStorage::release) */
FORMAT_MASK = (7<<3), //!< mask for format flags
FORMAT_AUTO = 0, //!< flag, auto format
FORMAT_XML = (1<<3), //!< flag, XML format