Merge pull request #1675 from krodyush:opencl-optimization
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 30 Oct 2013 08:28:31 +0000 (12:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Oct 2013 08:28:31 +0000 (12:28 +0400)
1  2 
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl

Simple merge
Simple merge
Simple merge