Mercurial > hg > orthanc

diff Core/DicomParsing/FromDcmtkBridge.cpp @ 3117:c8b75e207a82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
working on dcmtk 3.6.4 compatibility
author jodogne
date Sun, 13 Jan 2019 17:49:19 +0100
parents 4e43e67f8ecf
children 0c2b719c3796
line wrap: on
line diff
--- a/Core/DicomParsing/FromDcmtkBridge.cpp	Fri Jan 11 11:34:58 2019 +0100
+++ b/Core/DicomParsing/FromDcmtkBridge.cpp	Sun Jan 13 17:49:19 2019 +0100
@@ -41,6 +41,10 @@
 #  error The macro ORTHANC_SANDBOXED must be defined
 #endif
 
+#if !defined(DCMTK_VERSION_NUMBER)
+#  error The macro DCMTK_VERSION_NUMBER must be defined
+#endif
+
 #include "FromDcmtkBridge.h"
 #include "ToDcmtkBridge.h"
 #include "../Logging.h"
@@ -165,7 +169,11 @@
 
       ~DictionaryLocker()
       {
+#if DCMTK_VERSION_NUMBER >= 364
+        dcmDataDict.wrunlock();
+#else
         dcmDataDict.unlock();
+#endif
       }
 
       DcmDataDictionary& operator*()