Mercurial > hg > orthanc-stone

diff Framework/Toolbox/DicomInstanceParameters.cpp @ 1298:8a0a62189f46

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 16:31:30 +0100
parents ea6c2254536d
children 257f2c9a02ac
line wrap: on
line diff
--- a/Framework/Toolbox/DicomInstanceParameters.cpp	Sun Feb 23 15:25:49 2020 +0100
+++ b/Framework/Toolbox/DicomInstanceParameters.cpp	Mon Mar 02 16:31:30 2020 +0100
@@ -369,7 +369,7 @@
 
   Orthanc::ImageAccessor* DicomInstanceParameters::ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const
   {
-    std::auto_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, 
+    std::unique_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, 
                                                                pixelData.GetWidth(), 
                                                                pixelData.GetHeight(),
                                                                false));
@@ -404,7 +404,7 @@
     else
     {
       // This is the case of a grayscale frame. Convert it to Float32.
-      std::auto_ptr<FloatTextureSceneLayer> texture;
+      std::unique_ptr<FloatTextureSceneLayer> texture;
 
       if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
       {
@@ -412,7 +412,7 @@
       }
       else
       {
-        std::auto_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
+        std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
         texture.reset(new FloatTextureSceneLayer(*converted));
       }
 
@@ -442,7 +442,7 @@
   LookupTableTextureSceneLayer* DicomInstanceParameters::CreateLookupTableTexture
   (const Orthanc::ImageAccessor& pixelData) const
   {
-    std::auto_ptr<FloatTextureSceneLayer> texture;
+    std::unique_ptr<FloatTextureSceneLayer> texture;
 
     if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
     {
@@ -450,7 +450,7 @@
     }
     else
     {
-      std::auto_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
+      std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
       return new LookupTableTextureSceneLayer(*converted);
     }
   }