Mercurial > hg > orthanc
comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3117:c8b75e207a82
working on dcmtk 3.6.4 compatibility
author | jodogne |
---|---|
date | Sun, 13 Jan 2019 17:49:19 +0100 |
parents | 4e43e67f8ecf |
children | 0c2b719c3796 |
comparison
equal
deleted
inserted
replaced
3114:0e75026a2c02 | 3117:c8b75e207a82 |
---|---|
39 | 39 |
40 #if !defined(ORTHANC_SANDBOXED) | 40 #if !defined(ORTHANC_SANDBOXED) |
41 # error The macro ORTHANC_SANDBOXED must be defined | 41 # error The macro ORTHANC_SANDBOXED must be defined |
42 #endif | 42 #endif |
43 | 43 |
44 #if !defined(DCMTK_VERSION_NUMBER) | |
45 # error The macro DCMTK_VERSION_NUMBER must be defined | |
46 #endif | |
47 | |
44 #include "FromDcmtkBridge.h" | 48 #include "FromDcmtkBridge.h" |
45 #include "ToDcmtkBridge.h" | 49 #include "ToDcmtkBridge.h" |
46 #include "../Logging.h" | 50 #include "../Logging.h" |
47 #include "../Toolbox.h" | 51 #include "../Toolbox.h" |
48 #include "../OrthancException.h" | 52 #include "../OrthancException.h" |
163 { | 167 { |
164 } | 168 } |
165 | 169 |
166 ~DictionaryLocker() | 170 ~DictionaryLocker() |
167 { | 171 { |
172 #if DCMTK_VERSION_NUMBER >= 364 | |
173 dcmDataDict.wrunlock(); | |
174 #else | |
168 dcmDataDict.unlock(); | 175 dcmDataDict.unlock(); |
176 #endif | |
169 } | 177 } |
170 | 178 |
171 DcmDataDictionary& operator*() | 179 DcmDataDictionary& operator*() |
172 { | 180 { |
173 return dictionary_; | 181 return dictionary_; |