mirror of
https://github.com/opencv/opencv.git
synced 2025-06-12 12:22:51 +08:00
Merge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10
This commit is contained in:
commit
80c64fce11
@ -1353,7 +1353,7 @@ CvSlice;
|
|||||||
|
|
||||||
CV_INLINE CvSlice cvSlice( int start, int end )
|
CV_INLINE CvSlice cvSlice( int start, int end )
|
||||||
{
|
{
|
||||||
#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
|
#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus) && !defined(__CUDACC__))
|
||||||
CvSlice slice = { start, end };
|
CvSlice slice = { start, end };
|
||||||
#else
|
#else
|
||||||
CvSlice slice(start, end);
|
CvSlice slice(start, end);
|
||||||
|
Loading…
Reference in New Issue
Block a user