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

check if scaling values changed

Browse Source
This commit is contained in:
marina.kolpakova 2012-11-14 20:28:08 +04:00
parent c3e4a52fbe
commit 0865227049
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gpu/src/softcascade.cpp
View File

@ -248,6 +248,17 @@ struct cv::gpu::SCascade::Fields
return fields; return fields;
} }
bool check(float mins,float maxs, int scales)
{
bool updated = (minScale == mins) || (maxScale == maxs) || (totals = scales);
minScale = mins;
maxScale = maxScale;
totals = scales;
return updated;
}
int createLevels(const int fh, const int fw) int createLevels(const int fh, const int fw)
{ {
using namespace device::icf; using namespace device::icf;
@ -509,7 +520,7 @@ void cv::gpu::SCascade::detect(InputArray image, InputArray _rois, OutputArray _
if (colored.type() == CV_8UC3) if (colored.type() == CV_8UC3)
{ {
if (!flds.update(colored.rows, colored.cols, flds.shrinkage)) if (!flds.update(colored.rows, colored.cols, flds.shrinkage) || flds.check(minScale, maxScale, scales))
flds.createLevels(colored.rows, colored.cols); flds.createLevels(colored.rows, colored.cols);
flds.preprocess(colored, s); flds.preprocess(colored, s);
} }