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

trying to debug the new cascade

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-12-17 14:51:22 +04:00
parent 9d3e7e027a
commit ef509ace43
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/objdetect/src/cascadedetect.cpp
View File

@ -561,21 +561,21 @@ bool HaarEvaluator::setImage( InputArray _image, Size _origWinSize, Size _sumSiz
else else
{ {
sum0.create(rn*rn_scale, cn, CV_32S); sum0.create(rn*rn_scale, cn, CV_32S);
sqsum0.create(rn, cn, CV_32S); sqsum0.create(rn, cn, CV_64F);
sum = sum0(Rect(0, 0, cols+1, rows+1)); sum = sum0(Rect(0, 0, cols+1, rows+1));
sqsum = sqsum0(Rect(0, 0, cols, rows)); sqsum = sqsum0(Rect(0, 0, cols+1, rows+1));
if( hasTiltedFeatures ) if( hasTiltedFeatures )
{ {
Mat tilted = sum0(Rect(0, _sumSize.height, cols+1, rows+1)); Mat tilted = sum0(Rect(0, _sumSize.height, cols+1, rows+1));
integral(_image, sum, noArray(), tilted, CV_32S); integral(_image, sum, sqsum, tilted, CV_32S);
tofs = (int)((tilted.data - sum.data)/sizeof(int)); tofs = (int)((tilted.data - sum.data)/sizeof(int));
} }
else else
integral(_image, sum, noArray(), noArray(), CV_32S); integral(_image, sum, sqsum, noArray(), CV_32S);
sqrBoxFilter(_image, sqsum, CV_32S, /*sqrBoxFilter(_image, sqsum, CV_32S,
Size(normrect.width, normrect.height), Size(normrect.width, normrect.height),
Point(0, 0), false); Point(0, 0), false);*/
sumStep = (int)(sum.step/sum.elemSize()); sumStep = (int)(sum.step/sum.elemSize());
} }
@ -608,7 +608,13 @@ bool HaarEvaluator::setWindow( Point pt )
const int* p = &sum.at<int>(pt); const int* p = &sum.at<int>(pt);
int valsum = CALC_SUM_OFS(nofs, p); int valsum = CALC_SUM_OFS(nofs, p);
double valsqsum = sqsum.at<int>(pt.y + normrect.y, pt.x + normrect.x);
int nqofs[4];
CV_SUM_OFS( nqofs[0], nqofs[1], nqofs[2], nqofs[3], 0, normrect, (int)(sqsum.step/sizeof(double)) );
const double* pq = &sqsum.at<double>(pt);
double valsqsum = CALC_SUM_OFS(nqofs, pq);
//double valsqsum = sqsum.at<int>(pt.y + normrect.y, pt.x + normrect.x);
double nf = (double)normrect.area() * valsqsum - (double)valsum * valsum; double nf = (double)normrect.area() * valsqsum - (double)valsum * valsum;
if( nf > 0. ) if( nf > 0. )