generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2280 from ilya-lavrenov:attempt_pvc

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-02-04 21:22:49 +04:00
committed by OpenCV Buildbot
parent b7ffed7b46 d957e8e40d
commit 564f5fcca3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/matrix.cpp
View File

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

4
modules/core/src/ocl.cpp
View File

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