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

load SoftCascade from FileStorage

Browse Source
This commit is contained in:
marina.kolpakova
2012-10-25 09:40:16 +04:00
parent a22ee13620
commit 017d970b9a
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/objdetect/src/softcascade.cpp
View File

@@ -499,24 +499,23 @@ struct cv::SoftCascade::Filds
cv::SoftCascade::SoftCascade() : filds(0) {}
cv::SoftCascade::SoftCascade( const string& filename, const float minScale, const float maxScale) : filds(0)
cv::SoftCascade::SoftCascade(const cv::FileStorage& fs, const float minScale, const float maxScale) : filds(0)
{
load(filename, minScale, maxScale);
read(fs, minScale, maxScale);
}
cv::SoftCascade::~SoftCascade()
{
delete filds;
}
bool cv::SoftCascade::load( const string& filename, const float minScale, const float maxScale)
bool cv::SoftCascade::read( const cv::FileStorage& fs, const float minScale, const float maxScale)
{
if (!fs.isOpened()) return false;
if (filds)
delete filds;
filds = 0;
cv::FileStorage fs(filename, FileStorage::READ);
if (!fs.isOpened()) return false;
filds = new Filds;
Filds& flds = *filds;
if (!flds.fill(fs.getFirstTopLevelNode(), minScale, maxScale)) return false;