GraphCut deprecated in CUDA 7.5 and removed in 8.0

10896129 · Vladislav Vinogradov · 855c058d · 10896129
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

modules/cudalegacy/src/graphcuts.cpp modules/cudalegacy/src/graphcuts.cpp +2 -1

未找到文件。
--- a/modules/cudalegacy/src/graphcuts.cpp
+++ b/modules/cudalegacy/src/graphcuts.cpp
@@ -42,7 +42,8 @@

 #include "precomp.hpp"

-#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
+// GraphCut has been removed in NPP 8.0
+#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || (CUDART_VERSION >= 8000)

 void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
 void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }