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

7ff9d7eb · Roman Donchenko · OpenCV Buildbot · 3715f71a · dda99954 · 7ff9d7eb
Commit 7ff9d7eb authored Jan 23, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jan 23, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

gpumat.cpp modules/core/src/gpumat.cpp +8 -0

No files found.
--- a/modules/core/src/gpumat.cpp
+++ b/modules/core/src/gpumat.cpp
@@ -620,11 +620,19 @@ void cv::gpu::GpuMat::copyTo(GpuMat& m) const
 void cv::gpu::GpuMat::copyTo(GpuMat& mat, const GpuMat& mask) const
 {
    if (mask.empty())
+    {
        copyTo(mat);
+    }
    else
    {
+        uchar* data0 = mat.data;
+
        mat.create(size(), type());

+        // do not leave dst uninitialized
+        if (mat.data != data0)
+            mat.setTo(Scalar::all(0));
+
        gpuFuncTable()->copyWithMask(*this, mat, mask);
    }
 }