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

Fixed reading of the user class from *.xml (ticket #840).

Browse Source
This commit is contained in:
Ilya Lysenkov
2011-06-01 10:05:11 +00:00
parent 68a94665e5
commit b6c195d44c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/include/opencv2/core/operations.hpp
View File

@@ -2828,7 +2828,10 @@ FileNodeIterator& operator >> (FileNodeIterator& it, vector<_Tp>& vec)
} }
template<typename _Tp> static inline void operator >> (const FileNode& n, _Tp& value) template<typename _Tp> static inline void operator >> (const FileNode& n, _Tp& value)
{ FileNodeIterator it = n.begin(); it >> value; } { read( n, value, _Tp()); }
template<typename _Tp> static inline void operator >> (const FileNode& n, vector<_Tp>& vec)
{ FileNodeIterator it = n.begin(); it >> vec; }
static inline bool operator == (const FileNodeIterator& it1, const FileNodeIterator& it2) static inline bool operator == (const FileNodeIterator& it1, const FileNodeIterator& it2)
{ {

2
samples/cpp/filestorage.cpp
View File

@@ -59,7 +59,7 @@ void read(const FileNode& node, MyData& x, const MyData& default_value = MyData(
if(node.empty()) if(node.empty())
x = default_value; x = default_value;
else else
x = (MyData)node; x.read(node);
} }
ostream& operator<<(ostream& out, const MyData& m){ ostream& operator<<(ostream& out, const MyData& m){