Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 2136:dd609a99d39a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniformization of the macro naming
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:08:05 +0100
parents bb199bccdc45
children aa4b8895cd23
comparison
equal deleted inserted replaced
2135:cadfe0a2a393 2136:dd609a99d39a
48 #include <boost/filesystem.hpp> 48 #include <boost/filesystem.hpp>
49 #include <curl/curl.h> 49 #include <curl/curl.h>
50 #include <boost/thread.hpp> 50 #include <boost/thread.hpp>
51 51
52 52
53 #if ORTHANC_JPEG_ENABLED == 1 53 #if ORTHANC_ENABLE_JPEG == 1
54 # include <dcmtk/dcmjpeg/djdecode.h> 54 # include <dcmtk/dcmjpeg/djdecode.h>
55 #endif 55 #endif
56 56
57 57
58 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 58 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
59 # include <dcmtk/dcmjpls/djdecode.h> 59 # include <dcmtk/dcmjpls/djdecode.h>
60 #endif 60 #endif
61 61
62 62
63 #include <dcmtk/dcmnet/dul.h> 63 #include <dcmtk/dcmnet/dul.h>
482 RegisterUserContentType(); 482 RegisterUserContentType();
483 483
484 FromDcmtkBridge::InitializeDictionary(); 484 FromDcmtkBridge::InitializeDictionary();
485 LoadCustomDictionary(configuration_); 485 LoadCustomDictionary(configuration_);
486 486
487 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 487 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
488 LOG(WARNING) << "Registering JPEG Lossless codecs"; 488 LOG(WARNING) << "Registering JPEG Lossless codecs";
489 DJLSDecoderRegistration::registerCodecs(); 489 DJLSDecoderRegistration::registerCodecs();
490 #endif 490 #endif
491 491
492 #if ORTHANC_JPEG_ENABLED == 1 492 #if ORTHANC_ENABLE_JPEG == 1
493 LOG(WARNING) << "Registering JPEG codecs"; 493 LOG(WARNING) << "Registering JPEG codecs";
494 DJDecoderRegistration::registerCodecs(); 494 DJDecoderRegistration::registerCodecs();
495 #endif 495 #endif
496 496
497 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); 497 fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
505 void OrthancFinalize() 505 void OrthancFinalize()
506 { 506 {
507 boost::recursive_mutex::scoped_lock lock(globalMutex_); 507 boost::recursive_mutex::scoped_lock lock(globalMutex_);
508 HttpClient::GlobalFinalize(); 508 HttpClient::GlobalFinalize();
509 509
510 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 510 #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
511 // Unregister JPEG-LS codecs 511 // Unregister JPEG-LS codecs
512 DJLSDecoderRegistration::cleanup(); 512 DJLSDecoderRegistration::cleanup();
513 #endif 513 #endif
514 514
515 #if ORTHANC_JPEG_ENABLED == 1 515 #if ORTHANC_ENABLE_JPEG == 1
516 // Unregister JPEG codecs 516 // Unregister JPEG codecs
517 DJDecoderRegistration::cleanup(); 517 DJDecoderRegistration::cleanup();
518 #endif 518 #endif
519 519
520 HttpClient::FinalizeOpenSsl(); 520 HttpClient::FinalizeOpenSsl();