diff --git a/modules/base/dllmain.cpp b/modules/base/dllmain.cpp index 4941376e..cd39d22d 100644 --- a/modules/base/dllmain.cpp +++ b/modules/base/dllmain.cpp @@ -50,18 +50,21 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser #else -void __attribute__((constructor)) global_load(void); -void __attribute__((destructor)) global_unload(void); - -void global_load(void) +class LogMgr { - g_hLog = EnableLog(nullptr, oem, "app"); -} +public: + LogMgr() + { + g_hLog = EnableLog(nullptr, oem, "app"); + } -void global_unload(void) -{ - DisableLog(g_hLog); - g_hLog = nullptr; -} + ~LogMgr() + { + DisableLog(g_hLog); + g_hLog = nullptr; + } +}; + +LogMgr g_logMgr; #endif diff --git a/modules/imgfmt/dllmain.cpp b/modules/imgfmt/dllmain.cpp index 95cd4e25..130ef0bb 100644 --- a/modules/imgfmt/dllmain.cpp +++ b/modules/imgfmt/dllmain.cpp @@ -43,18 +43,21 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser #else -void __attribute__((constructor)) global_load(void); -void __attribute__((destructor)) global_unload(void); - -void global_load(void) +class LogMgr { - g_hLog = EnableLog(nullptr, oem, "app"); -} +public: + LogMgr() + { + g_hLog = EnableLog(nullptr, oem, "app"); + } -void global_unload(void) -{ - DisableLog(g_hLog); - g_hLog = nullptr; -} + ~LogMgr() + { + DisableLog(g_hLog); + g_hLog = nullptr; + } +}; + +LogMgr g_logMgr; #endif diff --git a/modules/imgproc/dllmain.cpp b/modules/imgproc/dllmain.cpp index 95cd4e25..130ef0bb 100644 --- a/modules/imgproc/dllmain.cpp +++ b/modules/imgproc/dllmain.cpp @@ -43,18 +43,21 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser #else -void __attribute__((constructor)) global_load(void); -void __attribute__((destructor)) global_unload(void); - -void global_load(void) +class LogMgr { - g_hLog = EnableLog(nullptr, oem, "app"); -} +public: + LogMgr() + { + g_hLog = EnableLog(nullptr, oem, "app"); + } -void global_unload(void) -{ - DisableLog(g_hLog); - g_hLog = nullptr; -} + ~LogMgr() + { + DisableLog(g_hLog); + g_hLog = nullptr; + } +}; + +LogMgr g_logMgr; #endif diff --git a/modules/twainui/dllmain.cpp b/modules/twainui/dllmain.cpp index 724505f5..e2627172 100644 --- a/modules/twainui/dllmain.cpp +++ b/modules/twainui/dllmain.cpp @@ -56,18 +56,21 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/) } #else -void __attribute__((constructor)) global_load(void); -void __attribute__((destructor)) global_unload(void); - -void global_load(void) +class LogMgr { - g_hLog = EnableLog(nullptr, oem, "app"); -} +public: + LogMgr() + { + g_hLog = EnableLog(nullptr, oem, "app"); + } -void global_unload(void) -{ - DisableLog(g_hLog); - g_hLog = nullptr; -} + ~LogMgr() + { + DisableLog(g_hLog); + g_hLog = nullptr; + } +}; + +LogMgr g_logMgr; #endif diff --git a/modules/version/dllmain.cpp b/modules/version/dllmain.cpp index 95cd4e25..130ef0bb 100644 --- a/modules/version/dllmain.cpp +++ b/modules/version/dllmain.cpp @@ -43,18 +43,21 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser #else -void __attribute__((constructor)) global_load(void); -void __attribute__((destructor)) global_unload(void); - -void global_load(void) +class LogMgr { - g_hLog = EnableLog(nullptr, oem, "app"); -} +public: + LogMgr() + { + g_hLog = EnableLog(nullptr, oem, "app"); + } -void global_unload(void) -{ - DisableLog(g_hLog); - g_hLog = nullptr; -} + ~LogMgr() + { + DisableLog(g_hLog); + g_hLog = nullptr; + } +}; + +LogMgr g_logMgr; #endif diff --git a/sdk/scannerlib/dllmain.cpp b/sdk/scannerlib/dllmain.cpp index 95cd4e25..130ef0bb 100644 --- a/sdk/scannerlib/dllmain.cpp +++ b/sdk/scannerlib/dllmain.cpp @@ -43,18 +43,21 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser #else -void __attribute__((constructor)) global_load(void); -void __attribute__((destructor)) global_unload(void); - -void global_load(void) +class LogMgr { - g_hLog = EnableLog(nullptr, oem, "app"); -} +public: + LogMgr() + { + g_hLog = EnableLog(nullptr, oem, "app"); + } -void global_unload(void) -{ - DisableLog(g_hLog); - g_hLog = nullptr; -} + ~LogMgr() + { + DisableLog(g_hLog); + g_hLog = nullptr; + } +}; + +LogMgr g_logMgr; #endif