Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 1656:d3ba98d6b6e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Sep 2015 15:13:34 +0200
parents 2dff2bdffdb8
children 57b9e6890482
comparison
equal deleted inserted replaced
1655:e40fd0d925c5 1656:d3ba98d6b6e9
37 #include "../Core/Logging.h" 37 #include "../Core/Logging.h"
38 #include "../Core/OrthancException.h" 38 #include "../Core/OrthancException.h"
39 #include "../Core/Toolbox.h" 39 #include "../Core/Toolbox.h"
40 #include "../Core/FileStorage/FilesystemStorage.h" 40 #include "../Core/FileStorage/FilesystemStorage.h"
41 41
42 #include "DicomProtocol/DicomServer.h"
43 #include "ServerEnumerations.h" 42 #include "ServerEnumerations.h"
44 #include "DatabaseWrapper.h" 43 #include "DatabaseWrapper.h"
44 #include "FromDcmtkBridge.h"
45 45
46 #include <boost/lexical_cast.hpp> 46 #include <boost/lexical_cast.hpp>
47 #include <boost/filesystem.hpp> 47 #include <boost/filesystem.hpp>
48 #include <curl/curl.h> 48 #include <curl/curl.h>
49 #include <boost/thread.hpp> 49 #include <boost/thread.hpp>
309 } 309 }
310 } 310 }
311 } 311 }
312 312
313 313
314
314 void OrthancInitialize(const char* configurationFile) 315 void OrthancInitialize(const char* configurationFile)
315 { 316 {
316 boost::mutex::scoped_lock lock(globalMutex_); 317 boost::mutex::scoped_lock lock(globalMutex_);
317 318
318 #if ORTHANC_SSL_ENABLED == 1 319 #if ORTHANC_SSL_ENABLED == 1
336 GetGlobalStringParameterInternal("HttpsCACertificates", "")); 337 GetGlobalStringParameterInternal("HttpsCACertificates", ""));
337 338
338 RegisterUserMetadata(); 339 RegisterUserMetadata();
339 RegisterUserContentType(); 340 RegisterUserContentType();
340 341
341 DicomServer::InitializeDictionary(); 342 FromDcmtkBridge::InitializeDictionary();
342 343
343 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 344 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
344 LOG(WARNING) << "Registering JPEG Lossless codecs"; 345 LOG(WARNING) << "Registering JPEG Lossless codecs";
345 DJLSDecoderRegistration::registerCodecs(); 346 DJLSDecoderRegistration::registerCodecs();
346 #endif 347 #endif