Merge pull request #15653 from tolysz:patch-1

ebb77bb3 · Alexander Alekhin · 98fc0982 · 53400d86 · ebb77bb3
Commit ebb77bb3 authored Oct 07, 2019 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

private.cuda.hpp modules/core/include/opencv2/core/private.cuda.hpp +2 -0

No files found.
--- a/modules/core/include/opencv2/core/private.cuda.hpp
+++ b/modules/core/include/opencv2/core/private.cuda.hpp
@@ -72,7 +72,9 @@
 #  include "opencv2/core/cuda_stream_accessor.hpp"
 #  include "opencv2/core/cuda/common.hpp"

+# ifndef NPP_VERSION
 #  define NPP_VERSION (NPP_VERSION_MAJOR * 1000 + NPP_VERSION_MINOR * 100 + NPP_VERSION_BUILD)
+# endif

 #  define CUDART_MINIMUM_REQUIRED_VERSION 6050