Merge pull request #536 from bitwangyaoyao:2.4_fixHaar

3b1fc16f · Andrey Kamaev · OpenCV Buildbot · e6dd4e84 · 9bbf1700 · 3b1fc16f
展开全部隐藏空白更改
内联并排

Showing with 211 addition and 1454 deletion

modules/ocl/src/haar.cpp modules/ocl/src/haar.cpp +4 -1252

modules/ocl/src/kernels/haarobjectdetect.cl modules/ocl/src/kernels/haarobjectdetect.cl +207 -202

未找到文件。
--- a/modules/ocl/src/haar.cpp
+++ b/modules/ocl/src/haar.cpp
--- a/modules/ocl/src/kernels/haarobjectdetect.cl
+++ b/modules/ocl/src/kernels/haarobjectdetect.cl