Fix ocl::calcHarris not support CV_32FC1 bug.
A minor fix.
Fix merge conflicts
Fix the whitespace warning.
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test