Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 2380:96b3ec054b69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganization in macros
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 16:49:44 +0200
parents 3ab96768d144
children b8969010b534
comparison
equal deleted inserted replaced
2379:4900688827a8 2380:96b3ec054b69
49 #include <boost/filesystem.hpp> 49 #include <boost/filesystem.hpp>
50 #include <curl/curl.h> 50 #include <curl/curl.h>
51 #include <boost/thread/recursive_mutex.hpp> 51 #include <boost/thread/recursive_mutex.hpp>
52 52
53 53
54 #if ORTHANC_ENABLE_JPEG == 1 54 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
55 # include <dcmtk/dcmjpeg/djdecode.h> 55 # include <dcmtk/dcmjpeg/djdecode.h>
56 #endif 56 #endif
57 57
58 58
59 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1 59 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
60 # include <dcmtk/dcmjpls/djdecode.h> 60 # include <dcmtk/dcmjpls/djdecode.h>
61 #endif 61 #endif
62 62
63 63
64 #include <dcmtk/dcmnet/dul.h> 64 #include <dcmtk/dcmnet/dul.h>
493 RegisterUserContentType(); 493 RegisterUserContentType();
494 494
495 FromDcmtkBridge::InitializeDictionary(GetGlobalBoolParameterInternal("LoadPrivateDictionary", true)); 495 FromDcmtkBridge::InitializeDictionary(GetGlobalBoolParameterInternal("LoadPrivateDictionary", true));
496 LoadCustomDictionary(configuration_); 496 LoadCustomDictionary(configuration_);
497 497
498 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1 498 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
499 LOG(WARNING) << "Registering JPEG Lossless codecs"; 499 LOG(WARNING) << "Registering JPEG Lossless codecs";
500 DJLSDecoderRegistration::registerCodecs(); 500 DJLSDecoderRegistration::registerCodecs();
501 #endif 501 #endif
502 502
503 #if ORTHANC_ENABLE_JPEG == 1 503 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
504 LOG(WARNING) << "Registering JPEG codecs"; 504 LOG(WARNING) << "Registering JPEG codecs";
505 DJDecoderRegistration::registerCodecs(); 505 DJDecoderRegistration::registerCodecs();
506 #endif 506 #endif
507 507
508 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); 508 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
516 void OrthancFinalize() 516 void OrthancFinalize()
517 { 517 {
518 boost::recursive_mutex::scoped_lock lock(globalMutex_); 518 boost::recursive_mutex::scoped_lock lock(globalMutex_);
519 HttpClient::GlobalFinalize(); 519 HttpClient::GlobalFinalize();
520 520
521 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1 521 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
522 // Unregister JPEG-LS codecs 522 // Unregister JPEG-LS codecs
523 DJLSDecoderRegistration::cleanup(); 523 DJLSDecoderRegistration::cleanup();
524 #endif 524 #endif
525 525
526 #if ORTHANC_ENABLE_JPEG == 1 526 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
527 // Unregister JPEG codecs 527 // Unregister JPEG codecs
528 DJDecoderRegistration::cleanup(); 528 DJDecoderRegistration::cleanup();
529 #endif 529 #endif
530 530
531 HttpClient::FinalizeOpenSsl(); 531 HttpClient::FinalizeOpenSsl();