potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #11935 from mattmyne:filestorage_matx

Browse Source 
* Support for Matx read/write by FileStorage

* Only empty filestorage read now produces default Matx. Split Matx IO test into smaller units. Test checks for exception thrown if reading a Mat into a Matx of different size.
This commit is contained in:
Matt Bennett
2018-11-09 17:05:59 +00:00
committed by Alexander Alekhin
parent a1dd30ed50
commit 10e1c2b3cd
2 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/persistence.hpp
+23
View File
@@ -751,6 +751,17 @@ template<typename _Tp, int cn> static inline void read(const FileNode& node, Vec
value = temp.size() != cn ? default_value : Vec<_Tp, cn>(&temp[0]);
}
template<typename _Tp, int m, int n> static inline void read(const FileNode& node, Matx<_Tp, m, n>& value, const Matx<_Tp, m, n>& default_matx = Matx<_Tp, m, n>())
{
Mat temp;
read(node, temp); // read as a Mat class
if (temp.empty())
value = default_matx;
else
value = Matx<_Tp, m, n>(temp);
}
template<typename _Tp> static inline void read(const FileNode& node, Scalar_<_Tp>& value, const Scalar_<_Tp>& default_value)
{
std::vector<_Tp> temp; FileNodeIterator it = node.begin(); it >> temp;
@@ -931,6 +942,12 @@ void write(FileStorage& fs, const Vec<_Tp, cn>& v )
write(fs, v.val[i]);
}
template<typename _Tp, int m, int n> static inline
void write(FileStorage& fs, const Matx<_Tp, m, n>& x )
{
write(fs, Mat(x)); // write as a Mat class
}
template<typename _Tp> static inline
void write(FileStorage& fs, const Scalar_<_Tp>& s )
{
@@ -996,6 +1013,12 @@ void write(FileStorage& fs, const String& name, const Vec<_Tp, cn>& v )
write(fs, v);
}
template<typename _Tp, int m, int n> static inline
void write(FileStorage& fs, const String& name, const Matx<_Tp, m, n>& x )
{
write(fs, name, Mat(x)); // write as a Mat class
}
template<typename _Tp> static inline
void write(FileStorage& fs, const String& name, const Scalar_<_Tp>& s )
{