Merge pull request #2220 from ilya-lavrenov:tapi_accumulate

2014-01-30 17:33:06 +04:00
parent 66cc440c82 0d19cbcc7a
commit 77bbd65fa6
6 changed files with 561 additions and 26 deletions
--- a/modules/core/include/opencv2/core/opencl/ocl_defs.hpp
+++ b/modules/core/include/opencv2/core/opencl/ocl_defs.hpp
@@ -22,6 +22,15 @@
            fflush(stdout);                                                 \
        }                                                                   \
    }
+#elif defined CV_OPENCL_RUN_ASSERT
+#define CV_OCL_RUN_(condition, func, ...)                                   \
+    {                                                                       \
+        if (cv::ocl::useOpenCL() && (condition))                            \
+        {                                                                   \
+            CV_Assert(func);                                                \
+            return;                                                         \
+        }                                                                   \
+    }
 #else
 #define CV_OCL_RUN_(condition, func, ...)                                   \
    if (cv::ocl::useOpenCL() && (condition) && func)                        \