Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl

2014-02-03 14:10:20 +04:00
parent 206df7fdb1 e844c08203
commit cb1e4b2ede
5 changed files with 125 additions and 165 deletions
--- a/modules/core/include/opencv2/core/opencl/ocl_defs.hpp
+++ b/modules/core/include/opencv2/core/opencl/ocl_defs.hpp
@@ -28,7 +28,7 @@
        if (cv::ocl::useOpenCL() && (condition))                            \
        {                                                                   \
            CV_Assert(func);                                                \
-            return;                                                         \
+            return __VA_ARGS__;                                             \
        }                                                                   \
    }
 #else