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

Merge pull request #6564 from jlguardi:ml_load_empty_ptr

Browse Source
This commit is contained in:
Maksim Shabunin 2016-05-23 08:41:05 +00:00
commit c393a7a98f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core.hpp
View File

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