Mercurial > hg > orthanc-stone

comparison Applications/Sdl/BasicSdlApplication.cpp @ 260:c887eddd48f1 am-2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author am@osimis.io
date Tue, 17 Jul 2018 14:43:42 +0200
parents 192e6e349e69
children 46c5296d867e
comparison
equal deleted inserted replaced
258:e5a9b3d03478 260:c887eddd48f1
29 #include "../../Framework/Toolbox/MessagingToolbox.h" 29 #include "../../Framework/Toolbox/MessagingToolbox.h"
30 #include "SdlEngine.h" 30 #include "SdlEngine.h"
31 31
32 #include <Core/Logging.h> 32 #include <Core/Logging.h>
33 #include <Core/HttpClient.h> 33 #include <Core/HttpClient.h>
34 #include <Core/Toolbox.h>
34 #include <Plugins/Samples/Common/OrthancHttpConnection.h> 35 #include <Plugins/Samples/Common/OrthancHttpConnection.h>
35 36
36 namespace OrthancStone 37 namespace OrthancStone
37 { 38 {
38 // Anonymous namespace to avoid clashes against other compilation modules 39 // Anonymous namespace to avoid clashes against other compilation modules
88 /****************************************************************** 89 /******************************************************************
89 * Initialize all the subcomponents of Orthanc Stone 90 * Initialize all the subcomponents of Orthanc Stone
90 ******************************************************************/ 91 ******************************************************************/
91 92
92 Orthanc::Logging::Initialize(); 93 Orthanc::Logging::Initialize();
93 Orthanc::HttpClient::InitializeOpenSsl(); 94 Orthanc::Toolbox::InitializeOpenSsl();
94 Orthanc::HttpClient::GlobalInitialize(); 95 Orthanc::HttpClient::GlobalInitialize();
95 SdlWindow::GlobalInitialize(); 96 SdlWindow::GlobalInitialize();
96 97
97 98
98 /****************************************************************** 99 /******************************************************************
290 * Finalize all the subcomponents of Orthanc Stone 291 * Finalize all the subcomponents of Orthanc Stone
291 ******************************************************************/ 292 ******************************************************************/
292 293
293 SdlWindow::GlobalFinalize(); 294 SdlWindow::GlobalFinalize();
294 Orthanc::HttpClient::GlobalFinalize(); 295 Orthanc::HttpClient::GlobalFinalize();
295 Orthanc::HttpClient::FinalizeOpenSsl(); 296 Orthanc::Toolbox::FinalizeOpenSsl();
296 297
297 return (success ? 0 : -1); 298 return (success ? 0 : -1);
298 } 299 }
299 300
300 } 301 }