Fixs: After scaling back to original image, some detected ROI will outside the original image ROI
Copy ocl::queryDeviceInfo interface from master to 2.4.
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
Fix ocl::pyrUp
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
Clean up spaces in ocl.hpp
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
This adds a similar interface with pure-cpp and gpu versions.
Merge pull request #884 from pengx17:2.4_pyrup_fix
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
removed VIBE implementation
Merge pull request #892 from jet47:removed-vibe
add accuracy tests while running perf
fix the waring in gemm test
add OpticalFlowDual_TVL1_OCL function
fix a warning
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
'aapt' tool moved in SDK r22, adding support to run.py
Simple set of the camera index to allow the user to change it after the object has been initialized.
Fix the mismatch on NV GPUs
Merge pull request #853 from icylord:2.4
Merge pull request #895 from bitwangyaoyao:2.4_perf