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

fixed UMat::copyTo(UMat)

Browse Source
This commit is contained in:
Ilya Lavrenov
2013-12-17 14:14:04 +04:00
parent 52a785e95a
commit ac030c16f1
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -643,11 +643,10 @@ void UMat::copyTo(OutputArray _dst) const
if( _dst.kind() == _InputArray::UMAT )
{
UMat dst = _dst.getUMat();
void* srchandle = handle(ACCESS_READ);
void* dsthandle = dst.handle(ACCESS_WRITE);
if( srchandle == dsthandle && dst.offset == offset )
if( u == dst.u && dst.offset == offset )
return;
dst.ndoffset(dstofs);
dstofs[dims-1] *= esz;
CV_Assert(u->currAllocator == dst.u->currAllocator);
u->currAllocator->copy(u, dst.u, dims, sz, srcofs, step.p, dstofs, dst.step.p, false);
}