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

now single row GPU matrix is continuous one, added aux. functions, updated dft and matchTemplates

Browse Source
This commit is contained in:
Alexey Spizhevoy
2010-12-24 09:26:19 +00:00
parent 54fcdf4cae
commit 21b081deff
6 changed files with 72 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gpu/src/matrix_operations.cpp
View File

@@ -67,6 +67,8 @@ namespace cv
void GpuMat::create(int /*_rows*/, int /*_cols*/, int /*_type*/) { throw_nogpu(); }
void GpuMat::release() { throw_nogpu(); }
void createContinuous(int /*rows*/, int /*cols*/, int /*type*/, GpuMat& /*m*/) { throw_nogpu(); }
void CudaMem::create(int /*_rows*/, int /*_cols*/, int /*_type*/, int /*type_alloc*/) { throw_nogpu(); }
bool CudaMem::canMapHostMemory() { throw_nogpu(); return false; }
void CudaMem::release() { throw_nogpu(); }
@@ -511,6 +513,10 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type)
void *dev_ptr;
cudaSafeCall( cudaMallocPitch(&dev_ptr, &step, esz * cols, rows) );
// Single row must be continuous
if (rows == 1)
step = esz * cols;
if (esz * cols == step)
flags |= Mat::CONTINUOUS_FLAG;
@@ -537,6 +543,14 @@ void cv::gpu::GpuMat::release()
refcount = 0;
}
void cv::gpu::createContinuous(int rows, int cols, int type, GpuMat& m)
{
int area = rows * cols;
if (!m.isContinuous() || m.type() != type || m.size().area() != area)
m.create(1, area, type);
m = m.reshape(0, rows);
}
///////////////////////////////////////////////////////////////////////
//////////////////////////////// CudaMem //////////////////////////////