mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25978 from chacha21:cuda_stdallocator

Browse Source 
Adding getStdAllocator() to cv::cuda::GpuMat
This commit is contained in:
Alexander Smorkalov 2024-08-05 10:58:33 +03:00 committed by GitHub
commit 9de2ebbec1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/cuda.hpp
View File

@ -118,6 +118,7 @@ public:
//! default allocator
CV_WRAP static GpuMat::Allocator* defaultAllocator();
CV_WRAP static void setDefaultAllocator(GpuMat::Allocator* allocator);
CV_WRAP static GpuMat::Allocator* getStdAllocator();
//! default constructor
CV_WRAP explicit GpuMat(GpuMat::Allocator* allocator = GpuMat::defaultAllocator());

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

@ -135,6 +135,7 @@ namespace
DefaultAllocator cudaDefaultAllocator;
GpuMat::Allocator* g_defaultAllocator = &cudaDefaultAllocator;
GpuMat::Allocator* g_stdAllocator = &cudaDefaultAllocator;
}
GpuMat::Allocator* cv::cuda::GpuMat::defaultAllocator()
@ -148,6 +149,12 @@ void cv::cuda::GpuMat::setDefaultAllocator(Allocator* allocator)
g_defaultAllocator = allocator;
}
GpuMat::Allocator* cv::cuda::GpuMat::getStdAllocator()
{
return g_stdAllocator;
}
/////////////////////////////////////////////////////
/// create

5
modules/core/src/cuda_gpu_mat.cpp
View File

@ -420,6 +420,11 @@ void cv::cuda::GpuMat::setDefaultAllocator(Allocator* allocator)
throw_no_cuda();
}
GpuMat::Allocator* cv::cuda::GpuMat::getStdAllocator()
{
return 0;
}
void cv::cuda::GpuMat::create(int _rows, int _cols, int _type)
{
CV_UNUSED(_rows);