Fix compiler warnings for latest cuda npp which defines this itself as:
authorMarcin Tolysz <tolysz@gmail.com>
Mon, 7 Oct 2019 10:45:26 +0000 (11:45 +0100)
committerMarcin Tolysz <tolysz@gmail.com>
Mon, 7 Oct 2019 10:45:26 +0000 (11:45 +0100)
```
#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

index cda6cbc..b995501 100644 (file)
@@ -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