potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-10-20 11:37:54 +00:00
parent 5e9750d1f5 d8ffddd075
commit 9c23f2f1a6
16 changed files with 151 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/types_c.h
+1 -1
View File
@@ -1353,7 +1353,7 @@ CvSlice;
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 };
#else
CvSlice slice(start, end);