mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 13:13:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9940 from catree:fix_issue_9925

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-10-27 11:05:07 +00:00
commit 0c291c7768
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/objdetect/src/cascadedetect.hpp
View File

@ -263,7 +263,7 @@ protected:
(p0) = sum + (rect).x + (step) * (rect).y, \ (p0) = sum + (rect).x + (step) * (rect).y, \
/* (x + w, y) */ \ /* (x + w, y) */ \
(p1) = sum + (rect).x + (rect).width + (step) * (rect).y, \ (p1) = sum + (rect).x + (rect).width + (step) * (rect).y, \
/* (x + w, y) */ \ /* (x, y + h) */ \
(p2) = sum + (rect).x + (step) * ((rect).y + (rect).height), \ (p2) = sum + (rect).x + (step) * ((rect).y + (rect).height), \
/* (x + w, y + h) */ \ /* (x + w, y + h) */ \
(p3) = sum + (rect).x + (rect).width + (step) * ((rect).y + (rect).height) (p3) = sum + (rect).x + (rect).width + (step) * ((rect).y + (rect).height)
@ -289,7 +289,7 @@ protected:
(p0) = sum + (rect).x + (step) * (rect).y, \ (p0) = sum + (rect).x + (step) * (rect).y, \
/* (x + w, y) */ \ /* (x + w, y) */ \
(p1) = sum + (rect).x + (rect).width + (step) * (rect).y, \ (p1) = sum + (rect).x + (rect).width + (step) * (rect).y, \
/* (x + w, y) */ \ /* (x, y + h) */ \
(p2) = sum + (rect).x + (step) * ((rect).y + (rect).height), \ (p2) = sum + (rect).x + (step) * ((rect).y + (rect).height), \
/* (x + w, y + h) */ \ /* (x + w, y + h) */ \
(p3) = sum + (rect).x + (rect).width + (step) * ((rect).y + (rect).height) (p3) = sum + (rect).x + (rect).width + (step) * ((rect).y + (rect).height)
@ -305,11 +305,6 @@ protected:
(p3) = tilted + (rect).x + (rect).width - (rect).height \ (p3) = tilted + (rect).x + (rect).width - (rect).height \
+ (step) * ((rect).y + (rect).width + (rect).height) + (step) * ((rect).y + (rect).width + (rect).height)
#define CALC_SUM_(p0, p1, p2, p3, offset) \
((p0)[offset] - (p1)[offset] - (p2)[offset] + (p3)[offset])
#define CALC_SUM(rect,offset) CALC_SUM_((rect)[0], (rect)[1], (rect)[2], (rect)[3], offset)
#define CALC_SUM_OFS_(p0, p1, p2, p3, ptr) \ #define CALC_SUM_OFS_(p0, p1, p2, p3, ptr) \
((ptr)[p0] - (ptr)[p1] - (ptr)[p2] + (ptr)[p3]) ((ptr)[p0] - (ptr)[p1] - (ptr)[p2] + (ptr)[p3])