Skip to content

O
opencv
Commit 237f33d4 authored by Dan's avatar Dan
Browse files
Options

nullptr -> NULL

parent 76760470
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/core/src/matrix.cpp
View file @ 237f33d4
...@@ -220,25 +220,25 @@ public: ...@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment