Merge pull request #8713 from grundman:patch-6

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

Showing with 6 additions and 2 deletions

matrix.cpp modules/core/src/matrix.cpp +6 -2

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