GraphCut deprecated in 7.5 and removed in 8.0

0050df87 · Ilya Lavrenov · 01b5971c · 0050df87
Commit 0050df87 authored Nov 14, 2015 by Ilya Lavrenov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/modules/gpu/src/graphcuts.cpp
+++ b/modules/gpu/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::gpu::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }
 void cv::gpu::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }