comparison Framework/Radiography/RadiographyMaskLayer.h @ 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 68579a31eeb4
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "RadiographyLayer.h" 24 #include "RadiographyLayer.h"
25 #include "Core/Images/Image.h" 25
26 #include "Core/Images/ImageProcessing.h" 26 #include <Core/Compatibility.h>
27 #include <Core/Images/Image.h>
28 #include <Core/Images/ImageProcessing.h>
27 29
28 namespace OrthancStone 30 namespace OrthancStone
29 { 31 {
30 class RadiographyScene; 32 class RadiographyScene;
31 class RadiographyDicomLayer; 33 class RadiographyDicomLayer;
36 std::vector<Orthanc::ImageProcessing::ImagePoint> corners_; 38 std::vector<Orthanc::ImageProcessing::ImagePoint> corners_;
37 const RadiographyDicomLayer& dicomLayer_; 39 const RadiographyDicomLayer& dicomLayer_;
38 mutable bool invalidated_; 40 mutable bool invalidated_;
39 float foreground_; 41 float foreground_;
40 42
41 mutable std::auto_ptr<Orthanc::ImageAccessor> mask_; 43 mutable std::unique_ptr<Orthanc::ImageAccessor> mask_;
42 public: 44 public:
43 RadiographyMaskLayer(const RadiographyScene& scene, const RadiographyDicomLayer& dicomLayer, 45 RadiographyMaskLayer(const RadiographyScene& scene, const RadiographyDicomLayer& dicomLayer,
44 float foreground) : 46 float foreground) :
45 RadiographyLayer(scene), 47 RadiographyLayer(scene),
46 dicomLayer_(dicomLayer), 48 dicomLayer_(dicomLayer),