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.
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
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
ocl:perf: fix moments test for plain impl
Merge pull request #1916 from alalek:ocl_moments_fix_perf