Mercurial > hg > orthanc-stone
diff Framework/Deprecated/Toolbox/DicomFrameConverter.cpp @ 1308:adf234ecaa00 broker
Merge
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 04 Mar 2020 10:21:54 +0100 |
parents | 8a0a62189f46 |
children | 30deba7bc8e2 |
line wrap: on
line diff
--- a/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp Wed Mar 04 10:07:37 2020 +0100 +++ b/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp Wed Mar 04 10:21:54 2020 +0100 @@ -174,7 +174,7 @@ } - void DicomFrameConverter::ConvertFrameInplace(std::auto_ptr<Orthanc::ImageAccessor>& source) const + void DicomFrameConverter::ConvertFrameInplace(std::unique_ptr<Orthanc::ImageAccessor>& source) const { assert(sizeof(float) == 4); @@ -210,7 +210,7 @@ if (sourceFormat == Orthanc::PixelFormat_RGB24) { // This is the case of a color image. No conversion has to be done (*) - std::auto_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_RGB24, + std::unique_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_RGB24, source.GetWidth(), source.GetHeight(), false)); @@ -224,7 +224,7 @@ sourceFormat == Orthanc::PixelFormat_SignedGrayscale16); // This is the case of a grayscale frame. Convert it to Float32. - std::auto_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, + std::unique_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, source.GetWidth(), source.GetHeight(), false));