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

Merge pull request #2188 from jet47:gpumat-copyto-fix

Browse Source
This commit is contained in:
Roman Donchenko
2014-01-23 13:28:12 +04:00
committed by OpenCV Buildbot
parent 3715f71aaf dda999545c
commit 7ff9d7eb2d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/gpumat.cpp
View File

@@ -620,11 +620,19 @@ void cv::gpu::GpuMat::copyTo(GpuMat& m) const
void cv::gpu::GpuMat::copyTo(GpuMat& mat, const GpuMat& mask) const void cv::gpu::GpuMat::copyTo(GpuMat& mat, const GpuMat& mask) const
{ {
if (mask.empty()) if (mask.empty())
{
copyTo(mat); copyTo(mat);
}
else else
{ {
uchar* data0 = mat.data;
mat.create(size(), type()); mat.create(size(), type());
// do not leave dst uninitialized
if (mat.data != data0)
mat.setTo(Scalar::all(0));
gpuFuncTable()->copyWithMask(*this, mat, mask); gpuFuncTable()->copyWithMask(*this, mat, mask);
} }
} }