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

adjusting custom mat allocator when mat type is changed

Browse Source
This commit is contained in:
Andrey Pavlenko 2011-12-28 14:47:21 +00:00
parent 70da780c8e
commit fb051f78de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,12 +201,12 @@ void Mat::create(int d, const int* _sizes, int _type)
if( d == 0 ) if( d == 0 )
return; return;
flags = (_type & CV_MAT_TYPE_MASK) | MAGIC_VAL; flags = (_type & CV_MAT_TYPE_MASK) | MAGIC_VAL;
setSize(*this, d, _sizes, 0, allocator == 0); setSize(*this, d, _sizes, 0, true);
if( total() > 0 ) if( total() > 0 )
{ {
#ifdef HAVE_TGPU #ifdef HAVE_TGPU
if( !allocator ) allocator = tegra::getAllocator(d, _sizes, _type); if( !allocator || allocator == tegra::getAllocator() ) allocator = tegra::getAllocator(d, _sizes, _type);
#endif #endif
if( !allocator ) if( !allocator )
{ {