Merge pull request #3611 from jet47:fix-gpumat-setto

e501c61c · Vadim Pisarevsky · aacb9b7c · f676bfb3 · e501c61c
Commit e501c61c authored Jan 20, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

gpu_mat.cu modules/core/src/cuda/gpu_mat.cu +5 -0

No files found.
--- a/modules/core/src/cuda/gpu_mat.cu
+++ b/modules/core/src/cuda/gpu_mat.cu
@@ -390,6 +390,11 @@ GpuMat& cv::cuda::GpuMat::setTo(Scalar value, InputArray _mask, Stream& stream)

    GpuMat mask = _mask.getGpuMat();

+    if (mask.empty())
+    {
+        return setTo(value, stream);
+    }
+
    CV_DbgAssert( size() == mask.size() && mask.type() == CV_8UC1 );

    typedef void (*func_t)(const GpuMat& mat, const GpuMat& mask, Scalar scalar, Stream& stream);