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

Merge pull request #4176 from alalek:issue_4461

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-08-25 07:46:28 +00:00
commit edcd2c0408
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,20 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
a = a0; a = a0;
temp_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags); temp_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags);
} }
UMat::getStdAllocator()->allocate(temp_u, accessFlags, usageFlags); // TODO result is not checked bool allocated = false;
try
{
allocated = UMat::getStdAllocator()->allocate(temp_u, accessFlags, usageFlags);
}
catch (const cv::Exception& e)
{
fprintf(stderr, "Exception: %s\n", e.what());
}
if (!allocated)
{
allocated = getStdAllocator()->allocate(temp_u, accessFlags, usageFlags);
CV_Assert(allocated);
}
hdr.flags = flags; hdr.flags = flags;
setSize(hdr, dims, size.p, step.p); setSize(hdr, dims, size.p, step.p);
finalizeHdr(hdr); finalizeHdr(hdr);
@ -269,8 +282,11 @@ void UMat::create(int d, const int* _sizes, int _type, UMatUsageFlags _usageFlag
if( total() > 0 ) if( total() > 0 )
{ {
MatAllocator *a = allocator, *a0 = getStdAllocator(); MatAllocator *a = allocator, *a0 = getStdAllocator();
if(!a) if (!a)
{
a = a0; a = a0;
a0 = Mat::getStdAllocator();
}
try try
{ {
u = a->allocate(dims, size, _type, 0, step.p, 0, usageFlags); u = a->allocate(dims, size, _type, 0, step.p, 0, usageFlags);