Mercurial > hg > orthanc-stone
comparison Framework/Loaders/SeriesOrderedFrames.cpp @ 1299:c38c89684d83 broker
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 17:21:24 +0100 |
parents | 0ca50d275b9a |
children | c0af7657d398 |
comparison
equal
deleted
inserted
replaced
1297:6ab03e429f06 | 1299:c38c89684d83 |
---|---|
27 namespace OrthancStone | 27 namespace OrthancStone |
28 { | 28 { |
29 class SeriesOrderedFrames::Instance : public boost::noncopyable | 29 class SeriesOrderedFrames::Instance : public boost::noncopyable |
30 { | 30 { |
31 private: | 31 private: |
32 std::auto_ptr<Orthanc::DicomMap> dicom_; | 32 std::unique_ptr<Orthanc::DicomMap> dicom_; |
33 DicomInstanceParameters parameters_; | 33 DicomInstanceParameters parameters_; |
34 | 34 |
35 public: | 35 public: |
36 Instance(const Orthanc::DicomMap& dicom) : | 36 Instance(const Orthanc::DicomMap& dicom) : |
37 dicom_(dicom.Clone()), | 37 dicom_(dicom.Clone()), |
274 | 274 |
275 for (size_t i = 0; i < instances.GetSize(); i++) | 275 for (size_t i = 0; i < instances.GetSize(); i++) |
276 { | 276 { |
277 try | 277 try |
278 { | 278 { |
279 std::auto_ptr<Instance> instance(new Instance(instances.GetResource(i))); | 279 std::unique_ptr<Instance> instance(new Instance(instances.GetResource(i))); |
280 numberOfFrames += instance->GetInstanceParameters().GetImageInformation().GetNumberOfFrames(); | 280 numberOfFrames += instance->GetInstanceParameters().GetImageInformation().GetNumberOfFrames(); |
281 instances_.push_back(instance.release()); | 281 instances_.push_back(instance.release()); |
282 } | 282 } |
283 catch (Orthanc::OrthancException&) | 283 catch (Orthanc::OrthancException&) |
284 { | 284 { |