projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af00cd5
)
probably fixed parallel face detector (i.e. built with TBB), ticket #1185. Thanks...
author
Vadim Pisarevsky
<no@email>
Thu, 7 Jul 2011 22:52:54 +0000
(22:52 +0000)
committer
Vadim Pisarevsky
<no@email>
Thu, 7 Jul 2011 22:52:54 +0000
(22:52 +0000)
modules/objdetect/src/haar.cpp
patch
|
blob
|
history
diff --git
a/modules/objdetect/src/haar.cpp
b/modules/objdetect/src/haar.cpp
index
001ed1e
..
2984dd9
100644
(file)
--- a/
modules/objdetect/src/haar.cpp
+++ b/
modules/objdetect/src/haar.cpp
@@
-850,6
+850,10
@@
struct HaarDetectObjects_ScaleImage_Invoker
Size winSize0 = cascade->orig_window_size;
Size winSize(cvRound(winSize0.width*factor), cvRound(winSize0.height*factor));
int y1 = range.begin()*stripSize, y2 = min(range.end()*stripSize, sum1.rows - 1 - winSize0.height);
+
+ if (y2 <= y1 || sum1.cols <= 1 + winSize0.width)
+ return;
+
Size ssz(sum1.cols - 1 - winSize0.width, y2 - y1);
int x, y, ystep = factor > 2 ? 1 : 2;