free -> deallocate

pull/6137/head
Dan 9 years ago
parent c0e34934c8
commit 95608b1b84
  1. 2
      modules/core/include/opencv2/core/cuda/utility.hpp
  2. 2
      modules/core/src/cuda/gpu_mat.cu

@ -59,7 +59,7 @@ namespace cv { namespace cuda { namespace device
typedef uchar value_type;
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 void setAllocator(ThrustAllocator* allocator);
};

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

Loading…
Cancel
Save