Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyAlphaLayer.cpp @ 1308:adf234ecaa00 broker
Merge
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 04 Mar 2020 10:21:54 +0100 |
| parents | 257f2c9a02ac |
| children |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyAlphaLayer.cpp Wed Mar 04 10:07:37 2020 +0100 +++ b/Framework/Radiography/RadiographyAlphaLayer.cpp Wed Mar 04 10:21:54 2020 +0100 @@ -23,8 +23,10 @@ #include "RadiographyScene.h" +#include <Core/Compatibility.h> #include <Core/Images/Image.h> #include <Core/OrthancException.h> + #include "../Toolbox/ImageGeometry.h" namespace OrthancStone @@ -32,7 +34,7 @@ void RadiographyAlphaLayer::SetAlpha(Orthanc::ImageAccessor* image) { - std::auto_ptr<Orthanc::ImageAccessor> raii(image); + std::unique_ptr<Orthanc::ImageAccessor> raii(image); if (image == NULL) { @@ -45,7 +47,12 @@ } SetSize(image->GetWidth(), image->GetHeight()); - alpha_ = raii; + +#if __cplusplus < 201103L + alpha_.reset(raii.release()); +#else + alpha_ = std::move(raii); +#endif BroadcastMessage(RadiographyLayer::LayerEditedMessage(*this)); }