Merge pull request opencv#4176 from alalek:issue_4461

vpisarev · vpisarev · commit edcd2c0408f3 · 2015-08-25T07:46:28.000Z
diff --git a/modules/core/src/umatrix.cpp b/modules/core/src/umatrix.cpp
@@ -230,7 +230,20 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
             a = a0;
         temp_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags);
     }
-    UMat::getStdAllocator()->allocate(temp_u, accessFlags, usageFlags); // TODO result is not checked
+    bool allocated = false;
+    try
+    {
+        allocated = UMat::getStdAllocator()->allocate(temp_u, accessFlags, usageFlags);
+    }
+    catch (const cv::Exception& e)
+    {
+        fprintf(stderr, "Exception: %s\n", e.what());
+    }
+    if (!allocated)
+    {
+        allocated = getStdAllocator()->allocate(temp_u, accessFlags, usageFlags);
+        CV_Assert(allocated);
+    }
     hdr.flags = flags;
     setSize(hdr, dims, size.p, step.p);
     finalizeHdr(hdr);
@@ -269,8 +282,11 @@ void UMat::create(int d, const int* _sizes, int _type, UMatUsageFlags _usageFlag
     if( total() > 0 )
     {
         MatAllocator *a = allocator, *a0 = getStdAllocator();
-        if(!a)
+        if (!a)
+        {
             a = a0;
+            a0 = Mat::getStdAllocator();
+        }
         try
         {
             u = a->allocate(dims, size, _type, 0, step.p, 0, usageFlags);
