diff Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h @ 1308:adf234ecaa00 broker

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 83af7e562b45 257f2c9a02ac
children 9bea7e15b519
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h	Wed Mar 04 10:07:37 2020 +0100
+++ b/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h	Wed Mar 04 10:21:54 2020 +0100
@@ -70,7 +70,7 @@
 
       void CheckSliceIndex(size_t index) const;
 
-      std::auto_ptr<OrthancStone::VolumeImageGeometry>     geometry_;
+      std::unique_ptr<OrthancStone::VolumeImageGeometry>     geometry_;
       std::vector<OrthancStone::DicomInstanceParameters*>  slices_;
       std::vector<uint64_t>                  slicesRevision_;
 
@@ -113,8 +113,8 @@
     unsigned int                                  simultaneousDownloads_;
     SeriesGeometry                                seriesGeometry_;
     boost::shared_ptr<OrthancStone::DicomVolumeImage>           volume_;
-    std::auto_ptr<OrthancStone::IFetchingItemsSorter::IFactory> sorter_;
-    std::auto_ptr<OrthancStone::IFetchingStrategy>              strategy_;
+    std::unique_ptr<OrthancStone::IFetchingItemsSorter::IFactory> sorter_;
+    std::unique_ptr<OrthancStone::IFetchingStrategy>              strategy_;
     std::vector<unsigned int>                     slicesQuality_;
     bool                                          volumeImageReadyInHighQuality_;