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

allocate CPU memory if Tegra GPU allocator failed.

Browse Source
This commit is contained in:
Marina Kolpakova 2012-03-16 14:11:39 +00:00
parent baa81de122
commit 0bc5140b17
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/core/src/matrix.cpp
View File

@ -217,8 +217,23 @@ void Mat::create(int d, const int* _sizes, int _type)
} }
else else
{ {
#ifdef HAVE_TGPU
try
{
allocator->allocate(dims, size, _type, refcount, datastart, data, step.p);
CV_Assert( step[dims-1] == (size_t)CV_ELEM_SIZE(flags) );
}catch(...)
{
allocator = 0;
size_t total = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount));
data = datastart = (uchar*)fastMalloc(total + (int)sizeof(*refcount));
refcount = (int*)(data + total);
*refcount = 1;
}
#else
allocator->allocate(dims, size, _type, refcount, datastart, data, step.p); allocator->allocate(dims, size, _type, refcount, datastart, data, step.p);
CV_Assert( step[dims-1] == (size_t)CV_ELEM_SIZE(flags) ); CV_Assert( step[dims-1] == (size_t)CV_ELEM_SIZE(flags) );
#endif
} }
} }