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

Merge pull request #3055 from akarsakov:copyto_UMat_fix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-08 14:20:02 +00:00
commit 74457cd3b5
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/umatrix.cpp
View File

@ -593,15 +593,16 @@ void* UMat::handle(int accessFlags) const
if( !u ) if( !u )
return 0; return 0;
if ((accessFlags & ACCESS_WRITE) != 0)
u->markHostCopyObsolete(true);
// check flags: if CPU copy is newer, copy it back to GPU. // check flags: if CPU copy is newer, copy it back to GPU.
if( u->deviceCopyObsolete() ) if( u->deviceCopyObsolete() )
{ {
CV_Assert(u->refcount == 0); CV_Assert(u->refcount == 0);
u->currAllocator->unmap(u); u->currAllocator->unmap(u);
} }
if ((accessFlags & ACCESS_WRITE) != 0)
u->markHostCopyObsolete(true);
return u->handle; return u->handle;
} }

18
modules/core/test/test_umat.cpp
View File

@ -745,6 +745,24 @@ TEST(UMat, Sync)
EXPECT_EQ(0, cvtest::norm(um.getMat(ACCESS_READ), cv::Mat(um.size(), um.type(), 19), NORM_INF)); EXPECT_EQ(0, cvtest::norm(um.getMat(ACCESS_READ), cv::Mat(um.size(), um.type(), 19), NORM_INF));
} }
TEST(UMat, CopyToIfDeviceCopyIsObsolete)
{
UMat um(7, 2, CV_8UC1);
Mat m(um.size(), um.type());
m.setTo(Scalar::all(0));
{
// make obsolete device copy of UMat
Mat temp = um.getMat(ACCESS_WRITE);
temp.setTo(Scalar::all(10));
}
m.copyTo(um);
um.setTo(Scalar::all(17));
EXPECT_EQ(0, cvtest::norm(um.getMat(ACCESS_READ), Mat(um.size(), um.type(), 17), NORM_INF));
}
TEST(UMat, setOpenCL) TEST(UMat, setOpenCL)
{ {
// save the current state // save the current state