Merge pull request #8713 from grundman:patch-6

7bd3ccd9 · Alexander Alekhin · 37b1bc9d · cf4e9e5c · 7bd3ccd9
Commit 7bd3ccd9 authored May 24, 2017 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

matrix.cpp modules/core/src/matrix.cpp +5 -1

No files found.
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -222,16 +222,20 @@ public:
 };
 namespace
 {
-    MatAllocator* g_matAllocator = NULL;
+    MatAllocator* volatile g_matAllocator = NULL;
 }
 MatAllocator* Mat::getDefaultAllocator()
 {
+    if (g_matAllocator == NULL)
+    {
+        cv::AutoLock lock(cv::getInitializationMutex());
        if (g_matAllocator == NULL)
        {
            g_matAllocator = getStdAllocator();
        }
+    }
    return g_matAllocator;
 }
 void Mat::setDefaultAllocator(MatAllocator* allocator)