mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nullptr -> NULL

Browse Source
This commit is contained in:
Dan 2015-12-08 10:37:54 -05:00
parent 76760470f3
commit 237f33d4f0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,25 +220,25 @@ public:
}; };
namespace namespace
{ {
MatAllocator* g_matAllocator = nullptr; MatAllocator* g_matAllocator = NULL;
} }
MatAllocator* Mat::getDefaultAllocator() MatAllocator* Mat::getDefaultAllocator()
{ {
if (g_matAllocator == nullptr) if (g_matAllocator == NULL)
{ {
g_matAllocator = getStdAllocator(); g_matAllocator = getStdAllocator();
} }
return g_matAllocator; return g_matAllocator;
} }
void Mat::setDefaultAllocator(MatAllocator* allocator) void Mat::setDefaultAllocator(MatAllocator* allocator)
{ {
g_matAllocator = allocator; g_matAllocator = allocator;
} }
MatAllocator* Mat::getStdAllocator() MatAllocator* Mat::getStdAllocator()
{ {
CV_SINGLETON_LAZY_INIT(MatAllocator, new StdMatAllocator()) CV_SINGLETON_LAZY_INIT(MatAllocator, new StdMatAllocator())
} }
void swap( Mat& a, Mat& b ) void swap( Mat& a, Mat& b )