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

free -> deallocate

Browse Source
This commit is contained in:
Dan 2016-02-18 15:05:13 -05:00
parent c0e34934c8
commit 95608b1b84
2 changed files with 2 additions and 2 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

@ -59,7 +59,7 @@ namespace cv { namespace cuda { namespace device
typedef uchar value_type; typedef uchar value_type;
virtual __device__ __host__ uchar* allocate(size_t numBytes) = 0; virtual __device__ __host__ uchar* allocate(size_t numBytes) = 0;
virtual __device__ __host__ void free(uchar* ptr) = 0; virtual __device__ __host__ void deallocate(uchar* ptr, size_t numBytes) = 0;
static ThrustAllocator& getAllocator(); static ThrustAllocator& getAllocator();
static void setAllocator(ThrustAllocator* allocator); static void setAllocator(ThrustAllocator* allocator);
}; };

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

@ -71,7 +71,7 @@ namespace
return NULL; return NULL;
#endif #endif
} }
__device__ __host__ void free(uchar* ptr) __device__ __host__ void deallocate(uchar* ptr, size_t numBytes)
{ {
#ifndef __CUDA_ARCH__ #ifndef __CUDA_ARCH__
CV_CUDEV_SAFE_CALL(cudaFree(ptr)); CV_CUDEV_SAFE_CALL(cudaFree(ptr));