generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bixed bug in cudaSafeCall

Browse Source
This commit is contained in:
Anatoly Baksheev 2010-07-15 15:32:17 +00:00
parent 55b1e9cbc7
commit b8535d1726
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/cuda/cuda_shared.hpp
View File

@ -65,7 +65,7 @@ namespace cv
} }
#ifdef __CUDACC__ #ifdef __CUDACC__
#define cudaSafeCall(err) { if( cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__); } #define cudaSafeCall(expr) { cudaError_t err = expr; if( cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__); }
#endif #endif
#endif /* __OPENCV_CUDA_SHARED_HPP__ */ #endif /* __OPENCV_CUDA_SHARED_HPP__ */

12
modules/gpu/src/precomp.hpp
View File

@ -53,14 +53,12 @@
#include <iostream> #include <iostream>
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"
#include "opencv2/gpu/gpumat.hpp"
#include "cuda_shared.hpp" #include "cuda_shared.hpp"
#ifndef HAVE_CUDA #ifndef HAVE_CUDA
#define cudaSafeCall(err) CV_Error(CV_GpuNotFound, "The library is compilled with no GPU support") #define cudaSafeCall(expr) CV_Error(CV_GpuNotFound, "The library is compilled with no GPU support")
#define cudaCallerSafeCall(err) CV_Error(CV_GpuNotFound, "The library is compilled with no GPU support") #define cudaCallerSafeCall(expr) CV_Error(CV_GpuNotFound, "The library is compilled with no GPU support")
#else /* HAVE_CUDA */ #else /* HAVE_CUDA */
@ -71,12 +69,12 @@
#include "cuda_runtime_api.h" #include "cuda_runtime_api.h"
#ifdef __GNUC__ #ifdef __GNUC__
#define cudaSafeCall(err) { if(cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__, __func__); } #define cudaSafeCall(expr) { cudaError_t err = expr; if(cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__, __func__); }
#else #else
#define cudaSafeCall(err) { if(cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__); } #define cudaSafeCall(expr) { cudaError_t err = expr; if(cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__); }
#endif #endif
#define cudaCallerSafeCall(err) err; #define cudaCallerSafeCall(expr) expr;
#endif /* HAVE_CUDA */ #endif /* HAVE_CUDA */