From 88a883e68ee9ab379118a1c68aa14ebaa24d8afd Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 17 Dec 2013 10:24:00 +0400 Subject: [PATCH] Build fix. --- modules/core/cuda/main.cpp | 2 ++ modules/core/include/opencv2/core/gpumat.hpp | 2 -- modules/core/src/gpumat.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/cuda/main.cpp b/modules/core/cuda/main.cpp index 26d4834201..4f47dc7e99 100644 --- a/modules/core/cuda/main.cpp +++ b/modules/core/cuda/main.cpp @@ -25,6 +25,8 @@ using namespace std; using namespace cv; using namespace cv::gpu; +#define throw_nogpu CV_Error(CV_GpuNotSupported, "The library is compiled without CUDA support") + #include "gpumat_cuda.hpp" #ifdef HAVE_CUDA diff --git a/modules/core/include/opencv2/core/gpumat.hpp b/modules/core/include/opencv2/core/gpumat.hpp index d62c8749b0..7556604610 100644 --- a/modules/core/include/opencv2/core/gpumat.hpp +++ b/modules/core/include/opencv2/core/gpumat.hpp @@ -48,8 +48,6 @@ #include "opencv2/core/core.hpp" #include "opencv2/core/cuda_devptrs.hpp" -#define throw_nogpu CV_Error(CV_GpuNotSupported, "The library is compiled without CUDA support") - namespace cv { namespace gpu { //////////////////////////////// Initialization & Info //////////////////////// diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp index f438dfd8b6..7e4eab4a16 100644 --- a/modules/core/src/gpumat.cpp +++ b/modules/core/src/gpumat.cpp @@ -65,6 +65,8 @@ using namespace std; using namespace cv; using namespace cv::gpu; +#define throw_nogpu CV_Error(CV_GpuNotSupported, "The library is compiled without CUDA support") + #include "gpumat_cuda.hpp" typedef GpuFuncTable* (*GpuFactoryType)();