opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 12:55:15 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3742 from vrabaud:cpp

Browse Source 
Get code to compile with CUDA 12.4
This commit is contained in:
Alexander Smorkalov
2024-05-27 17:24:12 +03:00
committed by GitHub
parent e46ba342b2 8c16a489a1
commit baaeb68b3d
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/cudaimgproc/src/histogram.cpp
View File

@@ -281,8 +281,13 @@ cv::Ptr<cv::cuda::CLAHE> cv::cuda::createCLAHE(double clipLimit, cv::Size tileGr
namespace namespace
{ {
#if (CUDA_VERSION >= 12040)
typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, size_t* hpBufferSize);
typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], size_t* hpBufferSize);
#else
typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, int* hpBufferSize); typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, int* hpBufferSize);
typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], int* hpBufferSize); typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], int* hpBufferSize);
#endif
template<int SDEPTH> struct NppHistogramEvenFuncC1 template<int SDEPTH> struct NppHistogramEvenFuncC1
{ {
@@ -315,7 +320,11 @@ namespace
sz.width = src.cols; sz.width = src.cols;
sz.height = src.rows; sz.height = src.rows;
#if (CUDA_VERSION >= 12040)
size_t buf_size;
#else
int buf_size; int buf_size;
#endif
get_buf_size(sz, levels, &buf_size); get_buf_size(sz, levels, &buf_size);
BufferPool pool(stream); BufferPool pool(stream);
@@ -349,7 +358,11 @@ namespace
Npp32s* pHist[] = {hist[0].ptr<Npp32s>(), hist[1].ptr<Npp32s>(), hist[2].ptr<Npp32s>(), hist[3].ptr<Npp32s>()}; Npp32s* pHist[] = {hist[0].ptr<Npp32s>(), hist[1].ptr<Npp32s>(), hist[2].ptr<Npp32s>(), hist[3].ptr<Npp32s>()};
#if (CUDA_VERSION >= 12040)
size_t buf_size;
#else
int buf_size; int buf_size;
#endif
get_buf_size(sz, levels, &buf_size); get_buf_size(sz, levels, &buf_size);
BufferPool pool(stream); BufferPool pool(stream);
@@ -419,7 +432,11 @@ namespace
sz.width = src.cols; sz.width = src.cols;
sz.height = src.rows; sz.height = src.rows;
#if (CUDA_VERSION >= 12040)
size_t buf_size;
#else
int buf_size; int buf_size;
#endif
get_buf_size(sz, levels.cols, &buf_size); get_buf_size(sz, levels.cols, &buf_size);
BufferPool pool(stream); BufferPool pool(stream);
@@ -460,7 +477,11 @@ namespace
sz.width = src.cols; sz.width = src.cols;
sz.height = src.rows; sz.height = src.rows;
#if (CUDA_VERSION >= 12040)
size_t buf_size;
#else
int buf_size; int buf_size;
#endif
get_buf_size(sz, nLevels, &buf_size); get_buf_size(sz, nLevels, &buf_size);
BufferPool pool(stream); BufferPool pool(stream);