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

Merge pull request #6261 from dtmoodie:issue_6251

Browse Source
This commit is contained in:
Alexander Alekhin 2016-03-15 07:51:24 +00:00
commit 947307baae
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/cuda/utility.hpp
View File

@ -57,7 +57,7 @@ namespace cv { namespace cuda { namespace device
struct CV_EXPORTS ThrustAllocator
{
typedef uchar value_type;
virtual ~ThrustAllocator();
virtual __device__ __host__ uchar* allocate(size_t numBytes) = 0;
virtual __device__ __host__ void deallocate(uchar* ptr, size_t numBytes) = 0;
static ThrustAllocator& getAllocator();

4
modules/core/src/cuda/gpu_mat.cu
View File

@ -56,6 +56,9 @@ using namespace cv;
using namespace cv::cuda;
using namespace cv::cudev;
device::ThrustAllocator::~ThrustAllocator()
{
}
namespace
{
class DefaultThrustAllocator: public cv::cuda::device::ThrustAllocator
@ -73,6 +76,7 @@ namespace
}
__device__ __host__ void deallocate(uchar* ptr, size_t numBytes)
{
(void)numBytes;
#ifndef __CUDA_ARCH__
CV_CUDEV_SAFE_CALL(cudaFree(ptr));
#endif