Mercurial > hg > orthanc-stone
diff Framework/StoneInitialization.cpp @ 1455:30deba7bc8e2
simplifying include_directories
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 11 Jun 2020 20:54:01 +0200 |
parents | 1c2d065ba372 |
children |
line wrap: on
line diff
--- a/Framework/StoneInitialization.cpp Sat Jun 06 11:04:04 2020 +0200 +++ b/Framework/StoneInitialization.cpp Thu Jun 11 20:54:01 2020 +0200 @@ -45,11 +45,11 @@ #endif #if ORTHANC_ENABLE_CURL == 1 -# include <Core/HttpClient.h> +# include <HttpClient.h> #endif #if ORTHANC_ENABLE_DCMTK == 1 -# include <Core/DicomParsing/FromDcmtkBridge.h> +# include <DicomParsing/FromDcmtkBridge.h> #endif #if ORTHANC_ENABLE_WASM == 1 @@ -59,25 +59,25 @@ #include "Toolbox/LinearAlgebra.h" -#include <Core/OrthancException.h> -#include <Core/Toolbox.h> +#include <Logging.h> +#include <OrthancException.h> +#include <Toolbox.h> #include <locale> namespace OrthancStone { -#if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 - void StoneInitialize(OrthancPluginContext* context) -#else - void StoneInitialize() -#endif + void StoneInitialize(void* pluginContext) { -#if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 - Orthanc::Logging::Initialize(context); -#else - Orthanc::Logging::Initialize(); -#endif + if (pluginContext != NULL) + { + Orthanc::Logging::InitializePluginContext(pluginContext); + } + else + { + Orthanc::Logging::Initialize(); + } #if ORTHANC_ENABLE_SSL == 1 // Must be before curl