mirror of
https://github.com/opencv/opencv.git
synced 2025-01-13 00:01:27 +08:00
fix GpuMat::copyTo method with mask:
fill destination matrix with zeros if it was reallocated(cherry picked from commit dda999545c
)
This commit is contained in:
parent
6cb7a7be18
commit
d5d88efd5d
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user