Merge pull request #885 from pengx17:2.4_bfmatcher_ocl

7d904146 · Vadim Pisarevsky · OpenCV Buildbot · 4d866ea3 · d053f216 · 7d904146
展开全部隐藏空白更改
内联并排

Showing with 5 addition and 372 deletion

modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/ocl.hpp +5 -372

未找到文件。
--- a/modules/ocl/include/opencv2/ocl/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp