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

fixed implementation gpumat::setTo()

Browse Source
This commit is contained in:
Andrey Morozov
2010-07-19 14:36:23 +00:00
parent c3f1a6e78a
commit 2be1c7d13f
2 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/src/matrix_operations.cpp
View File

@@ -111,23 +111,23 @@ void cv::gpu::GpuMat::convertTo( GpuMat& /*m*/, int /*rtype*/, double /*alpha*/,
GpuMat& GpuMat::operator = (const Scalar& s)
{
cv::gpu::impl::set_to_without_mask(*this, s.val, this->depth(), this->channels());
cv::gpu::impl::set_to_without_mask(*this, s.val, this->elemSize1(), this->channels());
return *this;
}
GpuMat& GpuMat::setTo(const Scalar& s, const GpuMat& mask)
{
CV_Assert(mask.type() == CV_8U);
//CV_Assert(mask.type() == CV_8U);
CV_DbgAssert(!this->empty());
if (mask.empty())
{
cv::gpu::impl::set_to_without_mask(*this, s.val, this->depth(), this->channels());
cv::gpu::impl::set_to_without_mask(*this, s.val, this->elemSize1(), this->channels());
}
else
{
cv::gpu::impl::set_to_with_mask(*this, s.val, mask, this->depth(), this->channels());
cv::gpu::impl::set_to_with_mask(*this, s.val, mask, this->elemSize1(), this->channels());
}
return *this;