potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-01-20 12:37:44 +00:00
parent aacb9b7cf5 f676bfb3d7
commit e501c61c04
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/cuda/gpu_mat.cu
+5
View File
@@ -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);