Merge pull request #2280 from ilya-lavrenov:attempt_pvc

564f5fcc · Andrey Pavlenko · OpenCV Buildbot · b7ffed7b · d957e8e4 · 564f5fcc
Commit 564f5fcc authored Feb 04, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Feb 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

ocl.cpp modules/core/src/ocl.cpp +2 -2

No files found.
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -221,8 +221,8 @@ public:
 MatAllocator* Mat::getStdAllocator()
 {
-    static StdMatAllocator allocator;
+    static MatAllocator * allocator = new StdMatAllocator();
-    return &allocator;
+    return allocator;
 }
 void swap( Mat& a, Mat& b )

--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -3959,8 +3959,8 @@ public:
 MatAllocator* getOpenCLAllocator()
 {
-    static OpenCLAllocator allocator;
+    static MatAllocator * allocator = new OpenCLAllocator();
-    return &allocator;
+    return allocator;
 }
 ///////////////////////////////////////////// Utility functions /////////////////////////////////////////////////