Merge pull request #2280 from ilya-lavrenov:attempt_pvc

modules/core/src/matrix.cpp

@@ -221,8 +221,8 @@ public:
 
 MatAllocator* Mat::getStdAllocator()
 {
-    static StdMatAllocator allocator;
-    return &allocator;
+    static MatAllocator * allocator = new StdMatAllocator();
+    return allocator;
 }
 
 void swap( Mat& a, Mat& b )

modules/core/src/ocl.cpp

@@ -3959,8 +3959,8 @@ public:
 
 MatAllocator* getOpenCLAllocator()
 {
-    static OpenCLAllocator allocator;
-    return &allocator;
+    static MatAllocator * allocator = new OpenCLAllocator();
+    return allocator;
 }
 
 ///////////////////////////////////////////// Utility functions /////////////////////////////////////////////////