mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: re-throw allocation exception if there is no fallback

Browse Source
This commit is contained in:
Alexander Alekhin 2018-10-12 19:10:06 +00:00
parent 28cb714a09
commit 8c4f886f5f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,15 +355,16 @@ void Mat::create(int d, const int* _sizes, int _type)
#endif #endif
if(!a) if(!a)
a = a0; a = a0;
CV_TRY try
{ {
u = a->allocate(dims, size, _type, 0, step.p, 0, USAGE_DEFAULT); u = a->allocate(dims, size, _type, 0, step.p, 0, USAGE_DEFAULT);
CV_Assert(u != 0); CV_Assert(u != 0);
} }
CV_CATCH_ALL catch (...)
{ {
if(a != a0) if (a == a0)
u = a0->allocate(dims, size, _type, 0, step.p, 0, USAGE_DEFAULT); throw;
u = a0->allocate(dims, size, _type, 0, step.p, 0, USAGE_DEFAULT);
CV_Assert(u != 0); CV_Assert(u != 0);
} }
CV_Assert( step[dims-1] == (size_t)CV_ELEM_SIZE(flags) ); CV_Assert( step[dims-1] == (size_t)CV_ELEM_SIZE(flags) );