Mercurial > hg > orthanc

comparison Core/DicomParsing/DicomDirWriter.cpp @ 3712:2a170a8f1faf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 15:32:45 +0100
parents 94f4a18a79cc
children
comparison
equal deleted inserted replaced
3709:1f4910999fe7 3712:2a170a8f1faf
102 #include "DicomDirWriter.h" 102 #include "DicomDirWriter.h"
103 103
104 #include "FromDcmtkBridge.h" 104 #include "FromDcmtkBridge.h"
105 #include "ToDcmtkBridge.h" 105 #include "ToDcmtkBridge.h"
106 106
107 #include "../Compatibility.h"
107 #include "../Logging.h" 108 #include "../Logging.h"
108 #include "../OrthancException.h" 109 #include "../OrthancException.h"
109 #include "../TemporaryFile.h" 110 #include "../TemporaryFile.h"
110 #include "../Toolbox.h" 111 #include "../Toolbox.h"
111 #include "../SystemToolbox.h" 112 #include "../SystemToolbox.h"
130 private: 131 private:
131 bool utc_; 132 bool utc_;
132 std::string fileSetId_; 133 std::string fileSetId_;
133 bool extendedSopClass_; 134 bool extendedSopClass_;
134 TemporaryFile file_; 135 TemporaryFile file_;
135 std::auto_ptr<DcmDicomDir> dir_; 136 std::unique_ptr<DcmDicomDir> dir_;
136 137
137 typedef std::pair<ResourceType, std::string> IndexKey; 138 typedef std::pair<ResourceType, std::string> IndexKey;
138 typedef std::map<IndexKey, DcmDirectoryRecord* > Index; 139 typedef std::map<IndexKey, DcmDirectoryRecord* > Index;
139 Index index_; 140 Index index_;
140 141
464 { 465 {
465 target = it->second; 466 target = it->second;
466 return false; // Already existing 467 return false; // Already existing
467 } 468 }
468 469
469 std::auto_ptr<DcmDirectoryRecord> record(new DcmDirectoryRecord(type, NULL, filename)); 470 std::unique_ptr<DcmDirectoryRecord> record(new DcmDirectoryRecord(type, NULL, filename));
470 471
471 switch (level) 472 switch (level)
472 { 473 {
473 case ResourceType_Patient: 474 case ResourceType_Patient:
474 FillPatient(*record, dataset, encoding, hasCodeExtensions); 475 FillPatient(*record, dataset, encoding, hasCodeExtensions);