Merge pull request #5340 from alalek:ocl_off
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 10 Nov 2015 16:53:36 +0000 (16:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 10 Nov 2015 16:53:36 +0000 (16:53 +0000)
commit3942b1f36261b196a264eb35c996222848fe3c93
tree1df08ab44d4206ff4e8f615b1ae6c3446bfa5fc6
parent38909d7959ebdc99396df4a36789958c5d8d42c2
parentbf42b9603bd4f8748919d0643e29f9c6ff2ee449
Merge pull request #5340 from alalek:ocl_off
14 files changed:
modules/calib3d/src/stereobm.cpp
modules/core/src/mathfuncs.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/core/test/test_umat.cpp
modules/features2d/src/fast.cpp
modules/features2d/src/matchers.cpp
modules/features2d/src/orb.cpp
modules/objdetect/src/cascadedetect.cpp
modules/stitching/src/warpers.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
modules/video/src/optflowgf.cpp
modules/video/src/tvl1flow.cpp