fix the bug of ocl::bruteForceMatcher
fix the mismatch running on cpu devices
Merge pull request #1687 from bitwangyaoyao:2.4_fix