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

Clarified default allocator interface.

Browse Source 
Conflicts:
	modules/core/src/matrix.cpp
This commit is contained in:
Dan Moodie
2015-11-30 15:45:48 -05:00
committed by Dan
parent 5d5cf32e22
commit 4f373a4284
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4292,7 +4292,7 @@ public:
bufferPoolSVM.setMaxReservedSize(poolSize);
#endif
matStdAllocator = Mat::getStdAllocator();
matStdAllocator = Mat::getDefaultAllocator();
}
UMatData* defaultAllocate(int dims, const int* sizes, int type, void* data, size_t* step,
@@ -4918,7 +4918,7 @@ public:
if( u->data && !u->hostCopyObsolete() )
{
Mat::getStdAllocator()->download(u, dstptr, dims, sz, srcofs, srcstep, dststep);
Mat::getDefaultAllocator()->download(u, dstptr, dims, sz, srcofs, srcstep, dststep);
return;
}
CV_Assert( u->handle != 0 );
@@ -5042,7 +5042,7 @@ public:
// 2. we overwrite part of the matrix, but the GPU copy is out-of-date
if( u->data && (u->hostCopyObsolete() < u->deviceCopyObsolete() || total == u->size))
{
Mat::getStdAllocator()->upload(u, srcptr, dims, sz, dstofs, dststep, srcstep);
Mat::getDefaultAllocator()->upload(u, srcptr, dims, sz, dstofs, dststep, srcstep);
u->markHostCopyObsolete(false);
u->markDeviceCopyObsolete(true);
return;