Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographySceneReader.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 1c7ae79c426d
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
53 return dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(orthancApiClient_, instanceId, frame, false, geometry))); 53 return dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(orthancApiClient_, instanceId, frame, false, geometry)));
54 } 54 }
55 55
56 RadiographyDicomLayer* RadiographySceneGeometryReader::LoadDicom(const std::string& instanceId, unsigned int frame, RadiographyLayer::Geometry* geometry) 56 RadiographyDicomLayer* RadiographySceneGeometryReader::LoadDicom(const std::string& instanceId, unsigned int frame, RadiographyLayer::Geometry* geometry)
57 { 57 {
58 std::auto_ptr<RadiographyPlaceholderLayer> layer(new RadiographyPlaceholderLayer(dynamic_cast<IObservable&>(scene_).GetBroker(), scene_)); 58 std::unique_ptr<RadiographyPlaceholderLayer> layer(new RadiographyPlaceholderLayer(dynamic_cast<IObservable&>(scene_).GetBroker(), scene_));
59 layer->SetGeometry(*geometry); 59 layer->SetGeometry(*geometry);
60 layer->SetSize(dicomImageWidth_, dicomImageHeight_); 60 layer->SetSize(dicomImageWidth_, dicomImageHeight_);
61 scene_.RegisterLayer(layer.get()); 61 scene_.RegisterLayer(layer.get());
62 62
63 return layer.release(); 63 return layer.release();
117 const std::string& pngContentBase64 = jsonLayer["content"].asString(); 117 const std::string& pngContentBase64 = jsonLayer["content"].asString();
118 std::string pngContent; 118 std::string pngContent;
119 std::string mimeType; 119 std::string mimeType;
120 Orthanc::Toolbox::DecodeDataUriScheme(mimeType, pngContent, pngContentBase64); 120 Orthanc::Toolbox::DecodeDataUriScheme(mimeType, pngContent, pngContentBase64);
121 121
122 std::auto_ptr<Orthanc::ImageAccessor> image; 122 std::unique_ptr<Orthanc::ImageAccessor> image;
123 if (mimeType == "image/png") 123 if (mimeType == "image/png")
124 { 124 {
125 image.reset(new Orthanc::PngReader()); 125 image.reset(new Orthanc::PngReader());
126 dynamic_cast<Orthanc::PngReader*>(image.get())->ReadFromMemory(pngContent); 126 dynamic_cast<Orthanc::PngReader*>(image.get())->ReadFromMemory(pngContent);
127 } 127 }