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

remove input frame size constraints

Browse Source
This commit is contained in:
marina.kolpakova
2012-11-01 15:43:50 +04:00
parent 3cb9afb4e7
commit ff8417db00
4 changed files with 45 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,16 +396,6 @@ struct cv::SoftCascade::Filds
if (fabs(scale - maxScale) < FLT_EPSILON) break;
scale = std::min(maxScale, expf(log(scale) + logFactor));
std::cout << "level " << sc << " scale "
<< levels[sc].origScale
<< " octeve "
<< levels[sc].octave->scale
<< " "
<< levels[sc].relScale
<< " [" << levels[sc].objSize.width
<< " " << levels[sc].objSize.height << "] ["
<< levels[sc].workRect.width << " " << levels[sc].workRect.height << "]" << std::endl;
}
}
@@ -523,10 +513,7 @@ bool cv::SoftCascade::read( const cv::FileStorage& fs)
filds = new Filds;
Filds& flds = *filds;
if (!flds.fill(fs.getFirstTopLevelNode(), minScale, maxScale)) return false;
// flds.calcLevels(FRAME_WIDTH, FRAME_HEIGHT, scales);
return true;
return flds.fill(fs.getFirstTopLevelNode(), minScale, maxScale);
}
void cv::SoftCascade::detectMultiScale(const Mat& image, const std::vector<cv::Rect>& /*rois*/,
@@ -535,9 +522,6 @@ void cv::SoftCascade::detectMultiScale(const Mat& image, const std::vector<cv::R
// only color images are supperted
CV_Assert(image.type() == CV_8UC3);
// only this window size allowed
CV_Assert(image.cols == 640 && image.rows == 480);
Filds& fld = *filds;
fld.calcLevels(image.size(), scales);