Merge pull request #2076 from ilya-lavrenov:tapi_dft

11 years ago · 01cd957495
parent 4644a864a5 2eab07f0a4
commit 01cd957495
1 changed files with 2 additions and 2 deletions
--- a/modules/core/src/dxt.cpp
+++ b/modules/core/src/dxt.cpp
@ -1726,8 +1726,8 @@ static bool ocl_dft(InputArray _src, OutputArray _dst, int flags)
 void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
 {
 #ifdef HAVE_CLAMDFFT
-    if (ocl::useOpenCL() && ocl::haveAmdFft() && _dst.isUMat() && _src0.dims() <= 2
-            && nonzero_rows == 0 && ocl_dft(_src0, _dst, flags))
+    if (ocl::useOpenCL() && ocl::haveAmdFft() && ocl::Device::getDefault().type() != ocl::Device::TYPE_CPU &&
+            _dst.isUMat() && _src0.dims() <= 2 && nonzero_rows == 0 && ocl_dft(_src0, _dst, flags))
        return;
 #endif