added GpuFeature assertion to gpu::Canny

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 254c888..e3c7efe 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -77,6 +77,7 @@ namespace cv
             FEATURE_SET_COMPUTE_20 = 20,\r
             FEATURE_SET_COMPUTE_21 = 21,\r
             GLOBAL_ATOMICS = FEATURE_SET_COMPUTE_11,\r
+            SHARED_ATOMICS = FEATURE_SET_COMPUTE_12,\r
             NATIVE_DOUBLE = FEATURE_SET_COMPUTE_13\r
         };\r
 \r

diff --git a/modules/gpu/src/brute_force_matcher.cpp b/modules/gpu/src/brute_force_matcher.cpp
index 86b74e4..ab24cb0 100644 (file)
--- a/modules/gpu/src/brute_force_matcher.cpp
+++ b/modules/gpu/src/brute_force_matcher.cpp
@@ -618,7 +618,7 @@ void cv::gpu::BruteForceMatcher_GPU_base::radiusMatch(const GpuMat& queryDescs,
         }\r
     };\r
 \r
-    CV_Assert(DeviceInfo().supports(GLOBAL_ATOMICS));\r
+    CV_Assert(TargetArchs::builtWith(GLOBAL_ATOMICS) && DeviceInfo().supports(GLOBAL_ATOMICS));\r
 \r
     const int nQuery = queryDescs.rows;\r
     const int nTrain = trainDescs.rows;\r

diff --git a/modules/gpu/src/imgproc.cpp b/modules/gpu/src/imgproc.cpp
index f65eee1..16a2de5 100644 (file)
--- a/modules/gpu/src/imgproc.cpp
+++ b/modules/gpu/src/imgproc.cpp
@@ -1782,6 +1782,7 @@ void cv::gpu::Canny(const GpuMat& src, CannyBuf& buf, GpuMat& dst, double low_th
 {\r
     using namespace cv::gpu::canny;\r
 \r
+    CV_Assert(TargetArchs::builtWith(SHARED_ATOMICS) && DeviceInfo().supports(SHARED_ATOMICS));\r
     CV_Assert(src.type() == CV_8UC1);\r
 \r
     if( low_thresh > high_thresh )\r
@@ -1820,6 +1821,7 @@ void cv::gpu::Canny(const GpuMat& dx, const GpuMat& dy, CannyBuf& buf, GpuMat& d
 {\r
     using namespace cv::gpu::canny;\r
 \r
+    CV_Assert(TargetArchs::builtWith(SHARED_ATOMICS) && DeviceInfo().supports(SHARED_ATOMICS));\r
     CV_Assert(dx.type() == CV_32SC1 && dy.type() == CV_32SC1 && dx.size() == dy.size());\r
 \r
     if( low_thresh > high_thresh )\r