Revert "Merge pull request #1779 from perping:integral_2.4"
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 28 Mar 2014 12:05:04 +0000 (16:05 +0400)
committerAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 28 Mar 2014 12:05:04 +0000 (16:05 +0400)
commite6e817e6137841c53bfb521a766d6c387951bfb6
tree379bcb29258ab5fcf06306f3d91ae331561c5182
parenta1d151924ddc3d2a8479e7db416af2d1417a79d4
Revert "Merge pull request #1779 from perping:integral_2.4"

This reverts commit 54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa, reversing
changes made to 28e0d3d771d9db9d03ea55f8d0504558e17139b2.
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/imgproc_integral.cl
modules/ocl/test/test_imgproc.cpp