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

Merge pull request #1983 from ilya-lavrenov:tapi_umat

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-12-13 19:29:49 +04:00 committed by OpenCV Buildbot
commit 8e15a6f98d
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,7 +580,6 @@ Mat UMat::getMat(int accessFlags) const
Mat hdr(dims, size.p, type(), u->data + offset, step.p);
hdr.flags = flags;
hdr.u = u;
hdr.flags = flags;
hdr.datastart = u->data;
hdr.data = hdr.datastart + offset;
hdr.datalimit = hdr.dataend = u->data + u->size;
@ -588,11 +587,14 @@ Mat UMat::getMat(int accessFlags) const
return hdr;
}
void* UMat::handle(int /*accessFlags*/) const
void* UMat::handle(int accessFlags) const
{
if( !u )
return 0;
if ((accessFlags & ACCESS_WRITE) != 0)
u->markHostCopyObsolete(true);
// check flags: if CPU copy is newer, copy it back to GPU.
if( u->deviceCopyObsolete() )
{

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

@ -237,3 +237,17 @@ TEST(Core_UMat, getUMat)
EXPECT_EQ(err, 0.);
}
}
TEST(UMat, Sync)
{
UMat um(10, 10, CV_8UC1);
{
Mat m = um.getMat(ACCESS_WRITE);
m.setTo(cv::Scalar::all(17));
}
um.setTo(cv::Scalar::all(19));
EXPECT_EQ(0, cv::norm(um.getMat(ACCESS_READ), cv::Mat(um.size(), um.type(), 19), NORM_INF));
}