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

Merge pull request #18522 from alalek:fix_18152

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/logger.cpp
View File

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

7
platforms/scripts/valgrind.supp
View File

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