Mercurial > hg > orthanc

comparison Core/OrthancFramework.cpp @ 4030:100fbe970762

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DANGEROUS commit: removing HAS_EMBEDDED_RESOURCES
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jun 2020 20:50:20 +0200
parents 156fece692e3
children
comparison
equal deleted inserted replaced
4029:156fece692e3 4030:100fbe970762
70 void InitializeFramework(const std::string& locale, 70 void InitializeFramework(const std::string& locale,
71 bool loadPrivateDictionary) 71 bool loadPrivateDictionary)
72 { 72 {
73 Logging::Initialize(); 73 Logging::Initialize();
74 74
75 #if !defined(__EMSCRIPTEN__) // No global locale in wasm/asm.js 75 #if (ORTHANC_ENABLE_LOCALE == 1) && !defined(__EMSCRIPTEN__) // No global locale in wasm/asm.js
76 if (locale.empty()) 76 if (locale.empty())
77 { 77 {
78 Toolbox::InitializeGlobalLocale(NULL); 78 Toolbox::InitializeGlobalLocale(NULL);
79 } 79 }
80 else 80 else
111 #if ORTHANC_ENABLE_CURL == 1 111 #if ORTHANC_ENABLE_CURL == 1
112 HttpClient::GlobalFinalize(); 112 HttpClient::GlobalFinalize();
113 #endif 113 #endif
114 114
115 Toolbox::FinalizeOpenSsl(); 115 Toolbox::FinalizeOpenSsl();
116
117 #if (ORTHANC_ENABLE_LOCALE == 1) && !defined(__EMSCRIPTEN__)
116 Toolbox::FinalizeGlobalLocale(); 118 Toolbox::FinalizeGlobalLocale();
119 #endif
120
117 Logging::Finalize(); 121 Logging::Finalize();
118 } 122 }
119 } 123 }