potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +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
2019-02-26 14:49:37 +03:00
parent 4188e8aaf9 dd696066b5
commit c3cf35ab63
123 changed files with 7773 additions and 6294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/cuda_host_mem.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ void cv::cuda::HostMem::create(int rows_, int cols_, int type_)
cols = cols_;
step = elemSize() * cols;
int sz[] = { rows, cols };
size_t steps[] = { step, CV_ELEM_SIZE(type_) };
size_t steps[] = { step, (size_t)CV_ELEM_SIZE(type_) };
flags = updateContinuityFlag(flags, 2, sz, steps);
if (alloc_type == SHARED)