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

Merge pull request #1903 from ilya-lavrenov:tapi_warp

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-12-04 11:34:51 +04:00
committed by OpenCV Buildbot
parent 001aa70556 803672feea
commit e585f145f6
8 changed files with 1307 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/ocl.hpp
View File

@@ -286,7 +286,7 @@ public:
Kernel();
Kernel(const char* kname, const Program& prog);
Kernel(const char* kname, const ProgramSource2& prog,
const String& buildopts, String* errmsg=0);
const String& buildopts = String(), String* errmsg=0);
~Kernel();
Kernel(const Kernel& k);
Kernel& operator = (const Kernel& k);

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

@@ -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;