Merge pull request #5340 from alalek:ocl_off

2015-11-10 16:53:36 +00:00
parent 38909d7959 bf42b9603b
commit 3942b1f362
16 changed files with 127 additions and 18 deletions
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -391,7 +391,9 @@ void setUseOptimized( bool flag )
    USE_SSE2 = currentFeatures->have[CV_CPU_SSE2];

    ipp::setUseIPP(flag);
+#ifdef HAVE_OPENCL
    ocl::setUseOpenCL(flag);
+#endif
 #ifdef HAVE_TEGRA_OPTIMIZATION
    ::tegra::setUseTegra(flag);
 #endif