Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 2512:4dcafa8d6633

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 28 Mar 2018 15:20:50 +0200
parents 83b8b6743531
children 97a74f0eac7a
comparison
equal deleted inserted replaced
2511:8a0d3044ef53 2512:4dcafa8d6633
35 35
36 #ifndef NOMINMAX 36 #ifndef NOMINMAX
37 #define NOMINMAX 37 #define NOMINMAX
38 #endif 38 #endif
39 39
40 #if !defined(ORTHANC_SANDBOXED)
41 # error The macro ORTHANC_SANDBOXED must be defined
42 #endif
43
40 #include "FromDcmtkBridge.h" 44 #include "FromDcmtkBridge.h"
41 #include "ToDcmtkBridge.h" 45 #include "ToDcmtkBridge.h"
42 #include "../Logging.h" 46 #include "../Logging.h"
43 #include "../SystemToolbox.h"
44 #include "../Toolbox.h" 47 #include "../Toolbox.h"
45 #include "../TemporaryFile.h"
46 #include "../OrthancException.h" 48 #include "../OrthancException.h"
49
50 #if ORTHANC_SANDBOXED == 0
51 # include "../SystemToolbox.h"
52 # include "../TemporaryFile.h"
53 #endif
47 54
48 #include <list> 55 #include <list>
49 #include <limits> 56 #include <limits>
50 57
51 #include <boost/lexical_cast.hpp> 58 #include <boost/lexical_cast.hpp>
1149 { 1156 {
1150 case ResourceType_Patient: 1157 case ResourceType_Patient:
1151 // The "PatientID" field is of type LO (Long String), 64 1158 // The "PatientID" field is of type LO (Long String), 64
1152 // Bytes Maximum. An UUID is of length 36, thus it can be used 1159 // Bytes Maximum. An UUID is of length 36, thus it can be used
1153 // as a random PatientID. 1160 // as a random PatientID.
1154 return SystemToolbox::GenerateUuid(); 1161 return Toolbox::GenerateUuid();
1155 1162
1156 case ResourceType_Instance: 1163 case ResourceType_Instance:
1157 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT); 1164 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
1158 1165
1159 case ResourceType_Series: 1166 case ResourceType_Series: