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

used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-05-30 13:11:32 +04:00
parent 1db4afac6a
commit 0489489322
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/gpu_mat.cpp
View File

@ -678,11 +678,17 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type)
size_t esz = elemSize(); size_t esz = elemSize();
void* devPtr; void* devPtr;
cudaSafeCall( cudaMallocPitch(&devPtr, &step, esz * cols, rows) );
// Single row must be continuous if (rows > 1 && cols > 1)
if (rows == 1) {
cudaSafeCall( cudaMallocPitch(&devPtr, &step, esz * cols, rows) );
}
else
{
// Single row or single column must be continuous
cudaSafeCall( cudaMalloc(&devPtr, esz * cols * rows) );
step = esz * cols; step = esz * cols;
}
if (esz * cols == step) if (esz * cols == step)
flags |= Mat::CONTINUOUS_FLAG; flags |= Mat::CONTINUOUS_FLAG;