From 53400d86e2befd8b37d4faca1c1f54e0ae7ddb55 Mon Sep 17 00:00:00 2001 From: Marcin Tolysz Date: Mon, 7 Oct 2019 11:45:26 +0100 Subject: [PATCH] Fix compiler warnings for latest cuda npp which defines this itself as: ``` #define NPP_VER_MAJOR 10 #define NPP_VER_MINOR 2 #define NPP_VER_PATCH 0 #define NPP_VER_BUILD 243 #define NPP_VERSION (NPP_VER_MAJOR * 1000 + \ NPP_VER_MINOR * 100 + \ NPP_VER_PATCH) --- modules/core/include/opencv2/core/private.cuda.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/include/opencv2/core/private.cuda.hpp b/modules/core/include/opencv2/core/private.cuda.hpp index cda6cbc4ae..b9955018bb 100644 --- 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