Merge pull request #18522 from alalek:fix_18152

4 years ago · 01981ed290
parent 793b2b9ad9 6f5d56d994
commit 01981ed290
2 changed files with 8 additions and 2 deletions
--- a/modules/core/src/logger.cpp
+++ b/modules/core/src/logger.cpp
@ -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
--- a/platforms/scripts/valgrind.supp
+++ b/platforms/scripts/valgrind.supp
@ -218,6 +218,13 @@
   fun:__itt_*create*
 }

+{
+   OpenCV-SingletonLogger
+   Memcheck:Leak
+   ...
+   fun:_ZN2cv5utils7logging8internalL26getGlobalLoggingInitStructEv
+}
+
 {
   OpenCV-gtk_init
   Memcheck:Leak