mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +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
{
MatAllocator* g_matAllocator = nullptr;
MatAllocator* g_matAllocator = NULL;
}
MatAllocator* Mat::getDefaultAllocator()
{
if (g_matAllocator == nullptr)
{
g_matAllocator = getStdAllocator();
}
return g_matAllocator;
if (g_matAllocator == NULL)
{
g_matAllocator = getStdAllocator();
}
return g_matAllocator;
}
void Mat::setDefaultAllocator(MatAllocator* allocator)
{
g_matAllocator = allocator;
g_matAllocator = allocator;
}
MatAllocator* Mat::getStdAllocator()
{
CV_SINGLETON_LAZY_INIT(MatAllocator, new StdMatAllocator())
CV_SINGLETON_LAZY_INIT(MatAllocator, new StdMatAllocator())
}
void swap( Mat& a, Mat& b )