Merge pull request #6752 from alalek:backport_6747

This commit is contained in:
Alexander Alekhin 2016-06-30 11:26:49 +00:00
commit 8bb8f8dcae

View File

@ -2558,10 +2558,10 @@ template<typename _Tp, size_t fixed_size> inline void AutoBuffer<_Tp, fixed_size
if(_size <= size)
return;
deallocate();
size = _size;
if(_size > fixed_size)
{
ptr = cv::allocate<_Tp>(_size);
size = _size;
}
}