Merge pull request #18522 from alalek:fix_18152

This commit is contained in:
Alexander Alekhin 2020-10-06 20:33:37 +00:00
commit 01981ed290
2 changed files with 8 additions and 2 deletions

View File

@ -94,8 +94,7 @@ LogLevel GlobalLoggingInitStruct::m_defaultUnconfiguredGlobalLevel = GlobalLoggi
//
static GlobalLoggingInitStruct& getGlobalLoggingInitStruct()
{
static GlobalLoggingInitStruct globalLoggingInitInstance;
return globalLoggingInitInstance;
CV_SINGLETON_LAZY_INIT_REF(GlobalLoggingInitStruct, new GlobalLoggingInitStruct());
}
// To ensure that the combined struct defined above is initialized even

View File

@ -218,6 +218,13 @@
fun:__itt_*create*
}
{
OpenCV-SingletonLogger
Memcheck:Leak
...
fun:_ZN2cv5utils7logging8internalL26getGlobalLoggingInitStructEv
}
{
OpenCV-gtk_init
Memcheck:Leak