potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #4150 from alalek:opencv_org_issue_4428

Browse Source
This commit is contained in:
Alexander Alekhin
2015-06-29 17:08:54 +00:00
parent d0c43f16e0 53fc5440d7
commit 50b453e5c2
6 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matrix.cpp
+1 -6
View File
@@ -222,14 +222,9 @@ public:
}
};
static StdMatAllocator *mat_allocator = NULL;
MatAllocator* Mat::getStdAllocator()
{
if (mat_allocator == NULL)
{
mat_allocator = new StdMatAllocator();
}
return mat_allocator;
CV_SINGLETON_LAZY_INIT(MatAllocator, new StdMatAllocator())
}
void swap( Mat& a, Mat& b )