mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4136 from alalek:fix_matallocator_destruction

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-06-22 11:49:36 +00:00
commit bd90425f71
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,10 +222,14 @@ public:
} }
}; };
static StdMatAllocator *mat_allocator = NULL;
MatAllocator* Mat::getStdAllocator() MatAllocator* Mat::getStdAllocator()
{ {
static StdMatAllocator allocator; if (mat_allocator == NULL)
return &allocator; {
mat_allocator = new StdMatAllocator();
}
return mat_allocator;
} }
void swap( Mat& a, Mat& b ) void swap( Mat& a, Mat& b )

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

@ -5237,10 +5237,15 @@ public:
MatAllocator* matStdAllocator; MatAllocator* matStdAllocator;
}; };
// This line should not force OpenCL runtime initialization! (don't put "new OpenCLAllocator()" here)
static MatAllocator *ocl_allocator = NULL;
MatAllocator* getOpenCLAllocator() MatAllocator* getOpenCLAllocator()
{ {
static MatAllocator * allocator = new OpenCLAllocator(); if (ocl_allocator == NULL)
return allocator; {
ocl_allocator = new OpenCLAllocator();
}
return ocl_allocator;
} }
}} // namespace cv::ocl }} // namespace cv::ocl