generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

datastart must be non-const in CUDA.

Browse Source
This commit is contained in:
Adil Ibragimov
2014-08-13 11:11:33 +04:00
parent 28f3a44e33
commit dfd0b297ce
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/cuda_gpu_mat.cpp
View File

@@ -49,7 +49,7 @@ using namespace cv::cuda;
cv::cuda::GpuMat::GpuMat(int rows_, int cols_, int type_, void* data_, size_t step_) :
flags(Mat::MAGIC_VAL + (type_ & Mat::TYPE_MASK)), rows(rows_), cols(cols_),
step(step_), data((uchar*)data_), refcount(0),
datastart((uchar*)data_), dataend((uchar*)data_),
datastart((uchar*)data_), dataend((const uchar*)data_),
allocator(defaultAllocator())
{
size_t minstep = cols * elemSize();
@@ -75,7 +75,7 @@ cv::cuda::GpuMat::GpuMat(int rows_, int cols_, int type_, void* data_, size_t st
cv::cuda::GpuMat::GpuMat(Size size_, int type_, void* data_, size_t step_) :
flags(Mat::MAGIC_VAL + (type_ & Mat::TYPE_MASK)), rows(size_.height), cols(size_.width),
step(step_), data((uchar*)data_), refcount(0),
datastart((uchar*)data_), dataend((uchar*)data_),
datastart((uchar*)data_), dataend((const uchar*)data_),
allocator(defaultAllocator())
{
size_t minstep = cols * elemSize();