Applied fix mentioned in bugreport 3370. Seems to solve the issue.
fixed comparison to stop integer wrap around
fixed compilation with CUDA 6.0:

GpuMat::setTo function, removed NPP call for CV_8S
ocl: try to disable clFinish workaround
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
Fixed some implicitly type conversions between vector and scalar data type.

There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
facedetect
multithreading facedetector
Merge pull request #1920 from alalek:ocl_disable_workaround
ocl: added workaround into Haar kernels
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().

The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.
some fixes
minor improvements
Merge pull request #1929 from alalek:ocl_haar_amd_beta
Merge pull request #2 from apavlenko/ocl_mt_test

minor improvements
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
Removing ocl::oclMat::ptr() method.

The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers