fixed compilation under linux

diff --git a/modules/gpu/src/cuda/internal_shared.hpp b/modules/gpu/src/cuda/internal_shared.hpp
index ecce14b..d0df0bb 100644 (file)
--- a/modules/gpu/src/cuda/internal_shared.hpp
+++ b/modules/gpu/src/cuda/internal_shared.hpp
@@ -48,6 +48,7 @@
 #include "NPP_staging.hpp"\r
 #include "opencv2/gpu/devmem2d.hpp"\r
 #include "safe_call.hpp"\r
+#include "opencv2/gpu/device/common.hpp"\r
 \r
 namespace cv { namespace gpu \r
 {\r

diff --git a/modules/gpu/src/cuda/safe_call.hpp b/modules/gpu/src/cuda/safe_call.hpp
index 0685a3e..94ba457 100644 (file)
--- a/modules/gpu/src/cuda/safe_call.hpp
+++ b/modules/gpu/src/cuda/safe_call.hpp
@@ -49,13 +49,11 @@
 #include "NCV.hpp"\r
 \r
 #if defined(__GNUC__)\r
-    #define cudaSafeCall(expr)  ___cudaSafeCall(expr, __FILE__, __LINE__, __func__)\r
     #define nppSafeCall(expr)  ___nppSafeCall(expr, __FILE__, __LINE__, __func__)\r
     #define ncvSafeCall(expr)  ___ncvSafeCall(expr, __FILE__, __LINE__, __func__)\r
     #define cufftSafeCall(expr)  ___cufftSafeCall(expr, __FILE__, __LINE__, __func__)\r
     #define cublasSafeCall(expr)  ___cublasSafeCall(expr, __FILE__, __LINE__, __func__)\r
 #else /* defined(__CUDACC__) || defined(__MSVC__) */\r
-    #define cudaSafeCall(expr)  ___cudaSafeCall(expr, __FILE__, __LINE__)\r
     #define nppSafeCall(expr)  ___nppSafeCall(expr, __FILE__, __LINE__)\r
     #define ncvSafeCall(expr)  ___ncvSafeCall(expr, __FILE__, __LINE__)\r
     #define cufftSafeCall(expr)  ___cufftSafeCall(expr, __FILE__, __LINE__)\r
@@ -64,19 +62,12 @@
 \r
 namespace cv { namespace gpu \r
 {\r
-    void error(const char *error_string, const char *file, const int line, const char *func = "");\r
     void nppError(int err, const char *file, const int line, const char *func = "");\r
     void ncvError(int err, const char *file, const int line, const char *func = "");\r
     void cufftError(int err, const char *file, const int line, const char *func = "");\r
     void cublasError(int err, const char *file, const int line, const char *func = "");\r
 }}\r
 \r
-static inline void ___cudaSafeCall(cudaError_t err, const char *file, const int line, const char *func = "")\r
-{\r
-    if (cudaSuccess != err)\r
-        cv::gpu::error(cudaGetErrorString(err), file, line, func);\r
-}\r
-\r
 static inline void ___nppSafeCall(int err, const char *file, const int line, const char *func = "")\r
 {\r
     if (err < 0)\r
@@ -101,4 +92,4 @@ static inline void ___cublasSafeCall(cublasStatus_t err, const char *file, const
         cv::gpu::cublasError(err, file, line, func);\r
 }\r
 \r
-#endif /* __OPENCV_CUDA_SAFE_CALL_HPP__ */
\ No newline at end of file
+#endif /* __OPENCV_CUDA_SAFE_CALL_HPP__ */\r

diff --git a/modules/gpu/src/opencv2/gpu/device/common.hpp b/modules/gpu/src/opencv2/gpu/device/common.hpp
index 9633d0a..7b93921 100644 (file)
--- a/modules/gpu/src/opencv2/gpu/device/common.hpp
+++ b/modules/gpu/src/opencv2/gpu/device/common.hpp
@@ -58,6 +58,25 @@
     #endif\r
 #endif\r
 \r
+#if defined(__GNUC__)\r
+    #define cudaSafeCall(expr)  ___cudaSafeCall(expr, __FILE__, __LINE__, __func__)\r
+#else /* defined(__CUDACC__) || defined(__MSVC__) */\r
+    #define cudaSafeCall(expr)  ___cudaSafeCall(expr, __FILE__, __LINE__)\r
+#endif\r
+\r
+namespace cv { namespace gpu \r
+{\r
+    void error(const char *error_string, const char *file, const int line, const char *func = "");\r
+}}\r
+\r
+static inline void ___cudaSafeCall(cudaError_t err, const char *file, const int line, const char *func = "")\r
+{\r
+    if (cudaSuccess != err)\r
+        cv::gpu::error(cudaGetErrorString(err), file, line, func);\r
+}\r
+\r
+#ifdef __CUDACC__\r
+\r
 namespace cv { namespace gpu \r
 {     \r
     __host__ __device__ __forceinline__ int divUp(int total, int grain) \r
@@ -80,21 +99,6 @@ namespace cv { namespace gpu
     }\r
 }}\r
 \r
-#if defined(__GNUC__)\r
-    #define cudaSafeCall(expr)  ___cudaSafeCall(expr, __FILE__, __LINE__, __func__)\r
-#else /* defined(__CUDACC__) || defined(__MSVC__) */\r
-    #define cudaSafeCall(expr)  ___cudaSafeCall(expr, __FILE__, __LINE__)\r
-#endif\r
-\r
-namespace cv { namespace gpu \r
-{\r
-    void error(const char *error_string, const char *file, const int line, const char *func = "");\r
-}}\r
-\r
-static inline void ___cudaSafeCall(cudaError_t err, const char *file, const int line, const char *func = "")\r
-{\r
-    if (cudaSuccess != err)\r
-        cv::gpu::error(cudaGetErrorString(err), file, line, func);\r
-}\r
+#endif // __CUDACC__\r
 \r
 #endif // __OPENCV_GPU_COMMON_HPP__\r