potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +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
2019-11-17 22:51:16 +00:00
committed by Alexander Alekhin
parent 1acadd363b f4d55d512f
commit fc41c18c6f
37 changed files with 1265 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence.cpp
+19
View File
@@ -2061,6 +2061,14 @@ FileNode::FileNode(const FileNode& node)
ofs = node.ofs;
}
FileNode& FileNode::operator=(const FileNode& node)
{
fs = node.fs;
blockIdx = node.blockIdx;
ofs = node.ofs;
return *this;
}
FileNode FileNode::operator[](const std::string& nodename) const
{
if(!fs)
@@ -2403,6 +2411,17 @@ FileNodeIterator::FileNodeIterator(const FileNodeIterator& it)
idx = it.idx;
}
FileNodeIterator& FileNodeIterator::operator=(const FileNodeIterator& it)
{
fs = it.fs;
blockIdx = it.blockIdx;
ofs = it.ofs;
blockSize = it.blockSize;
nodeNElems = it.nodeNElems;
idx = it.idx;
return *this;
}
FileNode FileNodeIterator::operator *() const
{
return FileNode(idx < nodeNElems ? fs : 0, blockIdx, ofs);