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

fixed CascadeClassifier::detectMultiScale when TBB

Browse Source
This commit is contained in:
Maria Dimashova 2010-10-25 12:05:22 +00:00
parent 886369069a
commit e0b40c26d8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -898,10 +898,10 @@ void CascadeClassifier::detectMultiScale( const Mat& image, vector<Rect>& object
int yStep = factor > 2. ? 1 : 2; int yStep = factor > 2. ? 1 : 2;
#ifdef HAVE_TBB #ifdef HAVE_TBB
const int PTS_PER_THREAD = 100; const int PTS_PER_THREAD = 1000;
stripCount = max(((sz1.height*sz1.width)/(yStep*yStep) + PTS_PER_THREAD/2)/PTS_PER_THREAD, 1); stripCount = ((sz1.width/yStep)*(sz1.height + yStep-1)/yStep + PTS_PER_THREAD/2)/PTS_PER_THREAD;
stripSize = (sz1.height + stripCount - 1)/stripCount; stripCount = std::min(std::max(stripCount, 1), 100);
stripSize = (stripSize/yStep)*yStep; stripSize = (((sz1.height + stripCount - 1)/stripCount + yStep-1)/yStep)*yStep;
#else #else
stripCount = 1; stripCount = 1;
stripSize = sz1.height; stripSize = sz1.height;

2
tests/cv/src/tsysa.cpp
View File

@ -50,7 +50,7 @@ const char* blacklist[] =
"calibrate-camera-artificial", //ticket 472 "calibrate-camera-artificial", //ticket 472
//"calibrate-camera-cpp", //ticket 564 //"calibrate-camera-cpp", //ticket 564
//"calibrate-stereo-c", //ticket 565 //"calibrate-stereo-c", //ticket 565
"cascade-detector", //ticket 432 //"cascade-detector", //ticket 432
"chessboard-detector", //ticket 569 "chessboard-detector", //ticket 569
"chessboard-subpixel", //ticket 473 "chessboard-subpixel", //ticket 473
"color-luv", //ticket 502 "color-luv", //ticket 502