fixed convertC3C4 and convertC4C3 functions in case cols == 1
Android NDK r9 support. x64 NDK support fix for MacOS X.
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
Merge pull request #1555 from ilya-lavrenov:ocl_convertC3C4
removed ocl::minMax_buf, updated doc (operation on matrices)
ocl: split initialization.cpp into 3 files: context, operations, programcache
ocl: move program names into opencl_kernels.hpp
ocl: file-based ProgramCache refactoring
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
ocl: merge with upstream/2.4
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
ocl: update ocl samples
ocl: update module documentation
Merge pull request #1561 from alalek:ocl_refactoring
refactored arithm binary operations in order to make them more scalable
fixed ocl::integral and enabled perf test for it
ocl: runtime, fix 32-bit builds
autogenerated code
ocl: stereo_csbp: divUp -> roundUp
Fix of bug #3283 and bug #3301
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.