OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27889 from Xingchen1224:4.x

Browse Source 
fix: Refactor tuple creation in nlm.cu for fixing nvcc build…
This commit is contained in:
Alexander Smorkalov 2025-10-11 17:05:46 +03:00 committed by GitHub
commit a74374d1ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/photo/src/cuda/nlm.cu
View File

@ -199,7 +199,7 @@ namespace cv { namespace cuda { namespace device
static __device__ __forceinline__ const thrust::tuple<plus<float>, plus<float> > op()
{
plus<float> op;
return thrust::make_tuple(op, op);
return { op, op };
}
};
template <> struct Unroll<2>
@ -218,7 +218,7 @@ namespace cv { namespace cuda { namespace device
static __device__ __forceinline__ const thrust::tuple<plus<float>, plus<float>, plus<float> > op()
{
plus<float> op;
return thrust::make_tuple(op, op, op);
return { op, op, op };
}
};
template <> struct Unroll<3>
@ -237,7 +237,7 @@ namespace cv { namespace cuda { namespace device
static __device__ __forceinline__ const thrust::tuple<plus<float>, plus<float>, plus<float>, plus<float> > op()
{
plus<float> op;
return thrust::make_tuple(op, op, op, op);
return { op, op, op, op };
}
};
template <> struct Unroll<4>