Merge pull request #6564 from jlguardi:ml_load_empty_ptr

This commit is contained in:
Maksim Shabunin 2016-05-23 08:41:05 +00:00
commit c393a7a98f

View File

@ -3036,6 +3036,7 @@ public:
{
FileStorage fs(filename, FileStorage::READ);
FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];
if (fn.empty()) return Ptr<_Tp>();
Ptr<_Tp> obj = _Tp::create();
obj->read(fn);
return !obj->empty() ? obj : Ptr<_Tp>();