fixed cmd parser when arg is like -+
Fix ocl::calcHarris not support CV_32FC1 bug.
A minor fix.
Fix merge conflicts
Fix the whitespace warning.
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
CV_WRAP for BackgroundSubtractorMOG2
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
Merge pull request #1899 from berak:b_3171_24
Ensure compilation to Javascript with Emscripten
fixing build of 2.4 branch with VC12 (aka 2013)
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
fix gpu test for Demosaicing:

check that input images was loaded correctly
added additional check in cv::gpu::demosaicing that source is not empty
ocl:perf: fix moments test for plain impl