Merge pull request #1903 from ilya-lavrenov:tapi_warp

2013-12-04 11:34:51 +04:00
parent 001aa70556 803672feea
commit e585f145f6
8 changed files with 1307 additions and 11 deletions
--- a/modules/core/src/umatrix.cpp
+++ b/modules/core/src/umatrix.cpp
@@ -578,6 +578,7 @@ Mat UMat::getMat(int accessFlags) const
    u->currAllocator->map(u, accessFlags | ACCESS_READ);
    CV_Assert(u->data != 0);
    Mat hdr(dims, size.p, type(), u->data + offset, step.p);
+    hdr.flags = flags;
    hdr.u = u;
    hdr.datastart = u->data;
    hdr.data = hdr.datastart + offset;