Mercurial > hg > orthanc

diff 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
line wrap: on
line diff
--- a/OrthancServer/OrthancInitialization.cpp	Wed Nov 09 13:42:33 2016 +0100
+++ b/OrthancServer/OrthancInitialization.cpp	Wed Nov 09 14:08:05 2016 +0100
@@ -50,12 +50,12 @@
 #include <boost/thread.hpp>
 
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
 #  include <dcmtk/dcmjpeg/djdecode.h>
 #endif
 
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
 #  include <dcmtk/dcmjpls/djdecode.h>
 #endif
 
@@ -484,12 +484,12 @@
     FromDcmtkBridge::InitializeDictionary();
     LoadCustomDictionary(configuration_);
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
     LOG(WARNING) << "Registering JPEG Lossless codecs";
     DJLSDecoderRegistration::registerCodecs();    
 #endif
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
     LOG(WARNING) << "Registering JPEG codecs";
     DJDecoderRegistration::registerCodecs(); 
 #endif
@@ -507,12 +507,12 @@
     boost::recursive_mutex::scoped_lock lock(globalMutex_);
     HttpClient::GlobalFinalize();
 
-#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG_LOSSLESS == 1
     // Unregister JPEG-LS codecs
     DJLSDecoderRegistration::cleanup();
 #endif
 
-#if ORTHANC_JPEG_ENABLED == 1
+#if ORTHANC_ENABLE_JPEG == 1
     // Unregister JPEG codecs
     DJDecoderRegistration::cleanup();
 #endif