Commit 95608b1b authored by Dan's avatar Dan

free -> deallocate

parent c0e34934
...@@ -59,7 +59,7 @@ namespace cv { namespace cuda { namespace device ...@@ -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);
}; };
......
...@@ -71,7 +71,7 @@ namespace ...@@ -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));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment