Skip to content

O
opencv
Commit fb051f78 authored by Andrey Pavlenko's avatar Andrey Pavlenko
Browse files
Options

adjusting custom mat allocator when mat type is changed

parent 70da780c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/core/src/matrix.cpp
View file @ fb051f78
...@@ -201,12 +201,12 @@ void Mat::create(int d, const int* _sizes, int _type) ...@@ -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 )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment