Andrey Pavlenko 3747d2643f Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels" ... This reverts commit 3dcddad88a. Conflicts: modules/ocl/src/opencl/haarobjectdetect.cl		2014-03-28 16:08:11 +04:00
..
doc	Revert "Merge pull request #1779 from perping:integral_2.4"	2014-03-28 16:05:04 +04:00
include/opencv2/ocl	Revert "Merge pull request #1779 from perping:integral_2.4"	2014-03-28 16:05:04 +04:00
perf	- fix test	2014-03-28 16:06:39 +04:00
src	Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"	2014-03-28 16:08:11 +04:00
test	Revert "Merge pull request #1779 from perping:integral_2.4"	2014-03-28 16:05:04 +04:00
CMakeLists.txt	ocl: add support for initialization from user-provided OpenCL handles	2013-12-12 19:59:22 +04:00