# HG changeset patch # User Sebastien Jodogne # Date 1583163090 -3600 # Node ID 8a0a62189f464fdfd90b471f237e35384649bb85 # Parent 86400fa16091899181c3f8e81080a23d98bb95e9 replacing std::auto_ptr by std::unique_ptr diff -r 86400fa16091 -r 8a0a62189f46 Applications/Generic/GuiAdapter.cpp --- a/Applications/Generic/GuiAdapter.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Generic/GuiAdapter.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -34,6 +34,8 @@ # include "../../Framework/Messages/LockingEmitter.h" #endif +#include + namespace OrthancStone { std::ostream& operator<<( @@ -195,7 +197,7 @@ // userData is OnMouseWheelFuncAdapterPayload FuncAdapterPayload* payload = reinterpret_cast*>(userData); - //std::auto_ptr< FuncAdapterPayload > deleter(payload); + //std::unique_ptr< FuncAdapterPayload > deleter(payload); bool ret = (*(payload->callback))(time, payload->userData); return static_cast(ret); } @@ -214,7 +216,7 @@ // here FuncAdapterPayload* payload = new FuncAdapterPayload(); - std::auto_ptr > payloadP(payload); + std::unique_ptr > payloadP(payload); payload->canvasId = canvasId; payload->callback = func; payload->userData = userData; @@ -239,7 +241,7 @@ EmscriptenSetCallbackFunc emFunc, std::string canvasId, void* userData, bool capture, GenericFunc func) { - std::auto_ptr > payload( + std::unique_ptr > payload( new FuncAdapterPayload() ); payload->canvasId = canvasId; @@ -262,7 +264,7 @@ void* userData, GenericFunc func) { // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)"; - std::auto_ptr > payload( + std::unique_ptr > payload( new FuncAdapterPayload() ); payload->canvasId = "UNDEFINED"; diff -r 86400fa16091 -r 8a0a62189f46 Applications/Qt/QCairoWidget.h --- a/Applications/Qt/QCairoWidget.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Qt/QCairoWidget.h Mon Mar 02 16:31:30 2020 +0100 @@ -49,10 +49,10 @@ } }; - std::auto_ptr image_; + std::unique_ptr image_; OrthancStone::CairoSurface surface_; OrthancStone::NativeStoneApplicationContext* context_; - std::auto_ptr observer_; + std::unique_ptr observer_; protected: virtual void paintEvent(QPaintEvent *event); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Qt/QtStoneApplicationRunner.h --- a/Applications/Qt/QtStoneApplicationRunner.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Qt/QtStoneApplicationRunner.h Mon Mar 02 16:31:30 2020 +0100 @@ -33,7 +33,7 @@ class QtStoneApplicationRunner : public NativeStoneApplicationRunner { protected: - std::auto_ptr window_; + std::unique_ptr window_; public: QtStoneApplicationRunner(MessageBroker& broker, diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/BasicPetCtFusionApplication.h --- a/Applications/Samples/BasicPetCtFusionApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/BasicPetCtFusionApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -179,9 +179,9 @@ VolumeImage& petVolume = context.AddSeriesVolume(pet, true /* progressive download */, 1); // Take the PET volume as the reference for the slices - std::auto_ptr interactor(new Interactor(petVolume, VolumeProjection_Axial, false /* don't reverse normal */)); + std::unique_ptr interactor(new Interactor(petVolume, VolumeProjection_Axial, false /* don't reverse normal */)); - std::auto_ptr widget(new LayeredSceneWidget); + std::unique_ptr widget(new LayeredSceneWidget); widget->AddLayer(new VolumeImage::LayerFactory(ctVolume)); widget->AddLayer(new VolumeImage::LayerFactory(petVolume)); widget->SetSlice(interactor->GetCursor().GetCurrentSlice()); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/LayoutPetCtFusionApplication.h --- a/Applications/Samples/LayoutPetCtFusionApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/LayoutPetCtFusionApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -208,7 +208,7 @@ LayeredSceneWidget* CreateWidget() { - std::auto_ptr widget(new LayeredSceneWidget); + std::unique_ptr widget(new LayeredSceneWidget); widget->Register(dynamic_cast(*this)); widget->Register(dynamic_cast(*this)); return widget.release(); @@ -217,7 +217,7 @@ void CreateLayout(BasicApplicationContext& context) { - std::auto_ptr layout(new OrthancStone::LayoutWidget); + std::unique_ptr layout(new OrthancStone::LayoutWidget); layout->SetBackgroundCleared(true); //layout->SetBackgroundColor(255,0,0); layout->SetPadding(5); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SampleInteractor.h --- a/Applications/Samples/SampleInteractor.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SampleInteractor.h Mon Mar 02 16:31:30 2020 +0100 @@ -47,7 +47,7 @@ VolumeProjection projection, bool reverse) { - std::auto_ptr slices(volume.GetGeometry(projection, reverse)); + std::unique_ptr slices(volume.GetGeometry(projection, reverse)); cursor_.SetGeometry(*slices); } @@ -56,7 +56,7 @@ { if (reverse) { - std::auto_ptr slices(series.GetGeometry().Reverse()); + std::unique_ptr slices(series.GetGeometry().Reverse()); cursor_.SetGeometry(*slices); } else diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SimpleViewer/SimpleViewerApplication.h --- a/Applications/Samples/SimpleViewer/SimpleViewerApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SimpleViewer/SimpleViewerApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -81,8 +81,8 @@ private: Tool currentTool_; - std::auto_ptr mainWidgetInteractor_; - std::auto_ptr thumbnailInteractor_; + std::unique_ptr mainWidgetInteractor_; + std::unique_ptr thumbnailInteractor_; Deprecated::LayoutWidget* mainLayout_; Deprecated::LayoutWidget* thumbnailsLayout_; Deprecated::SliceViewerWidget* mainWidget_; @@ -94,7 +94,7 @@ Deprecated::WidgetViewport* wasmViewport2_; Deprecated::IStatusBar* statusBar_; - std::auto_ptr smartLoader_; + std::unique_ptr smartLoader_; Orthanc::Font font_; diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SimpleViewerApplicationSingleFile.h --- a/Applications/Samples/SimpleViewerApplicationSingleFile.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SimpleViewerApplicationSingleFile.h Mon Mar 02 16:31:30 2020 +0100 @@ -239,8 +239,8 @@ }; Tool currentTool_; - std::auto_ptr mainWidgetInteractor_; - std::auto_ptr thumbnailInteractor_; + std::unique_ptr mainWidgetInteractor_; + std::unique_ptr thumbnailInteractor_; Deprecated::LayoutWidget* mainLayout_; Deprecated::LayoutWidget* thumbnailsLayout_; std::vector thumbnails_; @@ -253,7 +253,7 @@ Deprecated::WidgetViewport* wasmViewport2_; Deprecated::IStatusBar* statusBar_; - std::auto_ptr smartLoader_; + std::unique_ptr smartLoader_; Orthanc::Font font_; diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SingleFrameApplication.h --- a/Applications/Samples/SingleFrameApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SingleFrameApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -197,7 +197,7 @@ GetMainWidget().FitContent(); } - std::auto_ptr mainWidgetInteractor_; + std::unique_ptr mainWidgetInteractor_; const Deprecated::DicomSeriesVolumeSlicer* source_; unsigned int slice_; @@ -245,7 +245,7 @@ mainWidget_ = new Deprecated::SliceViewerWidget(GetBroker(), "main-widget"); - std::auto_ptr layer(new Deprecated::DicomSeriesVolumeSlicer(GetBroker(), context->GetOrthancApiClient())); + std::unique_ptr layer(new Deprecated::DicomSeriesVolumeSlicer(GetBroker(), context->GetOrthancApiClient())); source_ = layer.get(); layer->LoadFrame(instance, frame); layer->RegisterObserverCallback(new Callable(*this, &SingleFrameApplication::OnMainWidgetGeometryReady)); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SingleFrameEditorApplication.h --- a/Applications/Samples/SingleFrameEditorApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SingleFrameEditorApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -509,7 +509,7 @@ interactor_.SetMaskLayer(maskLayer_); { - std::auto_ptr renderedTextAlpha(TextRenderer::Render(Orthanc::EmbeddedResources::UBUNTU_FONT, 100, + std::unique_ptr renderedTextAlpha(TextRenderer::Render(Orthanc::EmbeddedResources::UBUNTU_FONT, 100, "%öÇaA&#")); RadiographyLayer& layer = scene_->LoadAlphaBitmap(renderedTextAlpha.release(), NULL); dynamic_cast(layer).SetForegroundValue(200.0f * 256.0f); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SingleVolumeApplication.h --- a/Applications/Samples/SingleVolumeApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SingleVolumeApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -170,10 +170,10 @@ throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); } - std::auto_ptr widget(new SliceViewerWidget); + std::unique_ptr widget(new SliceViewerWidget); #if 1 - std::auto_ptr volume(new OrthancVolumeImage(context.GetWebService(), true)); + std::unique_ptr volume(new OrthancVolumeImage(context.GetWebService(), true)); if (series.empty()) { volume->ScheduleLoadInstance(instance); @@ -206,14 +206,14 @@ widget->SetLayerStyle(0, s); } #else - std::auto_ptr ct(new OrthancVolumeImage(context_->GetWebService(), false)); + std::unique_ptr ct(new OrthancVolumeImage(context_->GetWebService(), false)); //ct->ScheduleLoadSeries("15a6f44a-ac7b88fe-19c462d9-dddd918e-b01550d8"); // 0178023P //ct->ScheduleLoadSeries("dd069910-4f090474-7d2bba07-e5c10783-f9e4fb1d"); //ct->ScheduleLoadSeries("a04ecf01-79b2fc33-58239f7e-ad9db983-28e81afa"); // IBA //ct->ScheduleLoadSeries("03677739-1d8bca40-db1daf59-d74ff548-7f6fc9c0"); // 0522c0001 TCIA ct->ScheduleLoadSeries("295e8a13-dfed1320-ba6aebb2-9a13e20f-1b3eb953"); // Captain - std::auto_ptr pet(new OrthancVolumeImage(context_->GetWebService(), true)); + std::unique_ptr pet(new OrthancVolumeImage(context_->GetWebService(), true)); //pet->ScheduleLoadSeries("48d2997f-8e25cd81-dd715b64-bd79cdcc-e8fcee53"); // 0178023P //pet->ScheduleLoadSeries("aabad2e7-80702b5d-e599d26c-4f13398e-38d58a9e"); //pet->ScheduleLoadInstance("830a69ff-8e4b5ee3-b7f966c8-bccc20fb-d322dceb"); // IBA 1 @@ -223,7 +223,7 @@ pet->ScheduleLoadInstance("f080888c-0ab7528a-f7d9c28c-84980eb1-ff3b0ae6"); // Captain 1 //pet->ScheduleLoadInstance("4f78055b-6499a2c5-1e089290-394acc05-3ec781c1"); // Captain 2 - std::auto_ptr rtStruct(new StructureSetLoader(context_->GetWebService())); + std::unique_ptr rtStruct(new StructureSetLoader(context_->GetWebService())); //rtStruct->ScheduleLoadInstance("c2ebc17b-6b3548db-5e5da170-b8ecab71-ea03add3"); // 0178023P //rtStruct->ScheduleLoadInstance("54460695-ba3885ee-ddf61ac0-f028e31d-a6e474d9"); // IBA //rtStruct->ScheduleLoadInstance("17cd032b-ad92a438-ca05f06a-f9e96668-7e3e9e20"); // 0522c0001 TCIA diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/StoneSampleCommands_generated.hpp --- a/Applications/Samples/StoneSampleCommands_generated.hpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/StoneSampleCommands_generated.hpp Mon Mar 02 16:31:30 2020 +0100 @@ -18,7 +18,7 @@ //#define STONEGEN_NO_CPP11 1 #ifdef STONEGEN_NO_CPP11 -#define StoneSmartPtr std::auto_ptr +#define StoneSmartPtr std::unique_ptr #else #define StoneSmartPtr std::unique_ptr #endif diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/SynchronizedSeriesApplication.h --- a/Applications/Samples/SynchronizedSeriesApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/SynchronizedSeriesApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -40,12 +40,12 @@ LayeredSceneWidget* CreateSeriesWidget(BasicApplicationContext& context, const std::string& series) { - std::auto_ptr loader + std::unique_ptr loader (new OrthancSeriesLoader(context.GetWebService().GetConnection(), series)); - std::auto_ptr interactor(new SampleInteractor(*loader, false)); + std::unique_ptr interactor(new SampleInteractor(*loader, false)); - std::auto_ptr widget(new LayeredSceneWidget); + std::unique_ptr widget(new LayeredSceneWidget); widget->AddLayer(new SeriesFrameRendererFactory(loader.release(), false)); widget->SetSlice(interactor->GetCursor().GetCurrentSlice()); widget->SetInteractor(*interactor); @@ -83,19 +83,19 @@ throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); } - std::auto_ptr a(CreateSeriesWidget(context, parameters["a"].as())); - std::auto_ptr b(CreateSeriesWidget(context, parameters["b"].as())); - std::auto_ptr c(CreateSeriesWidget(context, parameters["c"].as())); + std::unique_ptr a(CreateSeriesWidget(context, parameters["a"].as())); + std::unique_ptr b(CreateSeriesWidget(context, parameters["b"].as())); + std::unique_ptr c(CreateSeriesWidget(context, parameters["c"].as())); ReferenceLineFactory::Configure(*a, *b); ReferenceLineFactory::Configure(*a, *c); ReferenceLineFactory::Configure(*b, *c); - std::auto_ptr layout(new LayoutWidget); + std::unique_ptr layout(new LayoutWidget); layout->SetPadding(5); layout->AddWidget(a.release()); - std::auto_ptr layoutB(new LayoutWidget); + std::unique_ptr layoutB(new LayoutWidget); layoutB->SetVertical(); layoutB->SetPadding(5); layoutB->AddWidget(b.release()); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/TestPatternApplication.h --- a/Applications/Samples/TestPatternApplication.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/TestPatternApplication.h Mon Mar 02 16:31:30 2020 +0100 @@ -49,7 +49,7 @@ { using namespace OrthancStone; - std::auto_ptr layout(new LayoutWidget); + std::unique_ptr layout(new LayoutWidget); layout->SetPadding(10); layout->SetBackgroundCleared(true); layout->AddWidget(new TestCairoWidget(parameters["animate"].as())); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Samples/rt-viewer-demo/main.cpp --- a/Applications/Samples/rt-viewer-demo/main.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Samples/rt-viewer-demo/main.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -506,14 +506,14 @@ SliceViewerWidget& widget, StructureSetLoader& loader); SliceViewerWidget* CreateDoseCtWidget( - std::auto_ptr& ct, - std::auto_ptr& dose, - std::auto_ptr& structLoader, + std::unique_ptr& ct, + std::unique_ptr& dose, + std::unique_ptr& structLoader, VolumeProjection projection); void AddCtLayer(SliceViewerWidget& widget, OrthancVolumeImage& volume); - std::auto_ptr mainWidgetInteractor_; + std::unique_ptr mainWidgetInteractor_; const DicomSeriesVolumeSlicer* source_; unsigned int slice_; @@ -521,9 +521,9 @@ std::string doseInstance_; std::string doseSeries_; std::string structInstance_; - std::auto_ptr dose_; - std::auto_ptr ct_; - std::auto_ptr struct_; + std::unique_ptr dose_; + std::unique_ptr ct_; + std::unique_ptr struct_; public: RtViewerDemoApplication(MessageBroker& broker) : @@ -729,7 +729,7 @@ (ct_, dose_, struct_, OrthancStone::VolumeProjection_Axial); mainWidget_->AddWidget(axialWidget); - std::auto_ptr subLayout( + std::unique_ptr subLayout( new OrthancStone::LayoutWidget("main-layout")); subLayout->SetVertical(); subLayout->SetPadding(5); @@ -774,12 +774,12 @@ } SliceViewerWidget* RtViewerDemoApplication::CreateDoseCtWidget( - std::auto_ptr& ct, - std::auto_ptr& dose, - std::auto_ptr& structLoader, + std::unique_ptr& ct, + std::unique_ptr& dose, + std::unique_ptr& structLoader, VolumeProjection projection) { - std::auto_ptr widget( + std::unique_ptr widget( new OrthancStone::SliceViewerWidget(IObserver::GetBroker(), "ct-dose-widget")); diff -r 86400fa16091 -r 8a0a62189f46 Applications/Sdl/SdlCairoSurface.h --- a/Applications/Sdl/SdlCairoSurface.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Sdl/SdlCairoSurface.h Mon Mar 02 16:31:30 2020 +0100 @@ -27,6 +27,8 @@ #include "../../Framework/Wrappers/CairoSurface.h" #include "../../Framework/Deprecated/Viewport/IViewport.h" +#include + #include namespace OrthancStone @@ -34,7 +36,7 @@ class SdlCairoSurface : public boost::noncopyable { private: - std::auto_ptr cairoSurface_; + std::unique_ptr cairoSurface_; SdlWindow& window_; SDL_Surface* sdlSurface_; diff -r 86400fa16091 -r 8a0a62189f46 Applications/Sdl/SdlOrthancSurface.h --- a/Applications/Sdl/SdlOrthancSurface.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/Sdl/SdlOrthancSurface.h Mon Mar 02 16:31:30 2020 +0100 @@ -25,7 +25,9 @@ #include "../../Framework/Viewport/SdlWindow.h" +#include #include + #include namespace OrthancStone @@ -33,7 +35,7 @@ class SdlOrthancSurface : public boost::noncopyable { private: - std::auto_ptr image_; + std::unique_ptr image_; SdlWindow& window_; SDL_Surface* sdlSurface_; diff -r 86400fa16091 -r 8a0a62189f46 Applications/StoneApplicationContext.h --- a/Applications/StoneApplicationContext.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Applications/StoneApplicationContext.h Mon Mar 02 16:31:30 2020 +0100 @@ -62,7 +62,7 @@ MessageBroker& broker_; Deprecated::IWebService* webService_; Deprecated::IDelayedCallExecutor* delayedCallExecutor_; - std::auto_ptr orthanc_; + std::unique_ptr orthanc_; std::string orthancBaseUrl_; void InitializeOrthanc(); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/ColorFrameRenderer.cpp --- a/Framework/Deprecated/Layers/ColorFrameRenderer.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/ColorFrameRenderer.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -29,7 +29,7 @@ { OrthancStone::CairoSurface* ColorFrameRenderer::GenerateDisplay(const RenderStyle& style) { - std::auto_ptr display + std::unique_ptr display (new OrthancStone::CairoSurface(frame_->GetWidth(), frame_->GetHeight(), false /* no alpha */)); Orthanc::ImageAccessor target; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/ColorFrameRenderer.h --- a/Framework/Deprecated/Layers/ColorFrameRenderer.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/ColorFrameRenderer.h Mon Mar 02 16:31:30 2020 +0100 @@ -28,7 +28,7 @@ class ColorFrameRenderer : public FrameRenderer { private: - std::auto_ptr frame_; // In RGB24 + std::unique_ptr frame_; // In RGB24 protected: virtual OrthancStone::CairoSurface* GenerateDisplay(const RenderStyle& style); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/FrameRenderer.h --- a/Framework/Deprecated/Layers/FrameRenderer.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/FrameRenderer.h Mon Mar 02 16:31:30 2020 +0100 @@ -35,7 +35,7 @@ double pixelSpacingY_; RenderStyle style_; bool isFullQuality_; - std::auto_ptr display_; + std::unique_ptr display_; protected: virtual OrthancStone::CairoSurface* GenerateDisplay(const RenderStyle& style) = 0; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/GrayscaleFrameRenderer.cpp --- a/Framework/Deprecated/Layers/GrayscaleFrameRenderer.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/GrayscaleFrameRenderer.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -30,7 +30,7 @@ { assert(frame_->GetFormat() == Orthanc::PixelFormat_Float32); - std::auto_ptr result; + std::unique_ptr result; float windowCenter, windowWidth; style.ComputeWindowing(windowCenter, windowWidth, diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/GrayscaleFrameRenderer.h --- a/Framework/Deprecated/Layers/GrayscaleFrameRenderer.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/GrayscaleFrameRenderer.h Mon Mar 02 16:31:30 2020 +0100 @@ -29,7 +29,7 @@ class GrayscaleFrameRenderer : public FrameRenderer { private: - std::auto_ptr frame_; // In Float32 + std::unique_ptr frame_; // In Float32 float defaultWindowCenter_; float defaultWindowWidth_; Orthanc::PhotometricInterpretation photometric_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/SeriesFrameRendererFactory.h --- a/Framework/Deprecated/Layers/SeriesFrameRendererFactory.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/SeriesFrameRendererFactory.h Mon Mar 02 16:31:30 2020 +0100 @@ -30,11 +30,11 @@ class SeriesFrameRendererFactory : public ILayerRendererFactory { private: - std::auto_ptr loader_; + std::unique_ptr loader_; size_t currentFrame_; bool fast_; - std::auto_ptr currentDataset_; + std::unique_ptr currentDataset_; void ReadCurrentFrameDataset(size_t frame); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Layers/SingleFrameRendererFactory.h --- a/Framework/Deprecated/Layers/SingleFrameRendererFactory.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Layers/SingleFrameRendererFactory.h Mon Mar 02 16:31:30 2020 +0100 @@ -30,7 +30,7 @@ { private: OrthancPlugins::IOrthancConnection& orthanc_; - std::auto_ptr dicom_; + std::unique_ptr dicom_; std::string instance_; unsigned int frame_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/SmartLoader.cpp --- a/Framework/Deprecated/SmartLoader.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/SmartLoader.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -62,7 +62,7 @@ }; unsigned int sliceIndex_; - std::auto_ptr slice_; + std::unique_ptr slice_; boost::shared_ptr image_; SliceImageQuality effectiveQuality_; CachedSliceStatus status_; @@ -140,7 +140,7 @@ // the messages to its observables // in both cases, we must be carefull about objects lifecycle !!! - std::auto_ptr layerSource; + std::unique_ptr layerSource; std::string sliceKeyId = instanceId + ":" + boost::lexical_cast(frame); SmartLoader::CachedSlice* cachedSlice = NULL; @@ -199,7 +199,7 @@ cachedSlices_[sliceKeyId] = boost::shared_ptr(cachedSlice); - std::auto_ptr layerSource(new DicomSeriesVolumeSlicer(IObserver::GetBroker(), orthancApiClient_)); + std::unique_ptr layerSource(new DicomSeriesVolumeSlicer(IObserver::GetBroker(), orthancApiClient_)); dynamic_cast(layerSource.get())->SetImageQuality(imageQuality_); layerSource->RegisterObserverCallback(new OrthancStone::Callable(*this, &SmartLoader::OnLayerGeometryReady)); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/BaseWebService.cpp --- a/Framework/Deprecated/Toolbox/BaseWebService.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/BaseWebService.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -37,9 +37,9 @@ class BaseWebService::BaseWebServicePayload : public Orthanc::IDynamicObject { private: - std::auto_ptr< OrthancStone::MessageHandler > userSuccessHandler_; - std::auto_ptr< OrthancStone::MessageHandler > userFailureHandler_; - std::auto_ptr< Orthanc::IDynamicObject> userPayload_; + std::unique_ptr< OrthancStone::MessageHandler > userSuccessHandler_; + std::unique_ptr< OrthancStone::MessageHandler > userFailureHandler_; + std::unique_ptr< Orthanc::IDynamicObject> userPayload_; public: BaseWebServicePayload(OrthancStone::MessageHandler* userSuccessHandler, diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/DicomFrameConverter.cpp --- a/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -174,7 +174,7 @@ } - void DicomFrameConverter::ConvertFrameInplace(std::auto_ptr& source) const + void DicomFrameConverter::ConvertFrameInplace(std::unique_ptr& 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 converted(new Orthanc::Image(Orthanc::PixelFormat_RGB24, + std::unique_ptr 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 converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, + std::unique_ptr converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, source.GetWidth(), source.GetHeight(), false)); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/DicomFrameConverter.h --- a/Framework/Deprecated/Toolbox/DicomFrameConverter.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/DicomFrameConverter.h Mon Mar 02 16:31:30 2020 +0100 @@ -22,6 +22,7 @@ #pragma once #include +#include #include #include @@ -63,7 +64,7 @@ { // TODO: check whether this dtor is called or not // An MSVC warning explains that declaring an - // std::auto_ptr with a forward-declared type + // std::unique_ptr with a forward-declared type // prevents its dtor from being called. Does not // seem an issue here (only POD types inside), but // definitely something to keep an eye on. @@ -157,7 +158,7 @@ return rescaleSlope_; } - void ConvertFrameInplace(std::auto_ptr& source) const; + void ConvertFrameInplace(std::unique_ptr& source) const; Orthanc::ImageAccessor* ConvertFrame(const Orthanc::ImageAccessor& source) const; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/MessagingToolbox.cpp --- a/Framework/Deprecated/Toolbox/MessagingToolbox.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/MessagingToolbox.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -251,7 +251,7 @@ throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); } - std::auto_ptr result(new Orthanc::PngReader); + std::unique_ptr result(new Orthanc::PngReader); result->ReadFromMemory(compressed); if (targetFormat == Orthanc::PixelFormat_SignedGrayscale16) @@ -328,7 +328,7 @@ std::string jpeg; Orthanc::Toolbox::DecodeBase64(jpeg, info["PixelData"].asString()); - std::auto_ptr reader(new Orthanc::JpegReader); + std::unique_ptr reader(new Orthanc::JpegReader); reader->ReadFromMemory(jpeg); if (reader->GetFormat() == Orthanc::PixelFormat_RGB24) // This is a color image @@ -386,7 +386,7 @@ } // Decode a grayscale JPEG 8bpp image coming from the Web viewer - std::auto_ptr image + std::unique_ptr image (new Orthanc::Image(targetFormat, reader->GetWidth(), reader->GetHeight(), false)); float scaling = static_cast(stretchHigh - stretchLow) / 255.0f; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/OrthancApiClient.cpp --- a/Framework/Deprecated/Toolbox/OrthancApiClient.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/OrthancApiClient.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -68,11 +68,11 @@ class OrthancApiClient::WebServicePayload : public Orthanc::IDynamicObject { private: - std::auto_ptr< OrthancStone::MessageHandler > emptyHandler_; - std::auto_ptr< OrthancStone::MessageHandler > jsonHandler_; - std::auto_ptr< OrthancStone::MessageHandler > binaryHandler_; - std::auto_ptr< OrthancStone::MessageHandler > failureHandler_; - std::auto_ptr< Orthanc::IDynamicObject > userPayload_; + std::unique_ptr< OrthancStone::MessageHandler > emptyHandler_; + std::unique_ptr< OrthancStone::MessageHandler > jsonHandler_; + std::unique_ptr< OrthancStone::MessageHandler > binaryHandler_; + std::unique_ptr< OrthancStone::MessageHandler > failureHandler_; + std::unique_ptr< Orthanc::IDynamicObject > userPayload_; OrthancStone::MessageBroker& broker_; void NotifyConversionError(const IWebService::HttpRequestSuccessMessage& message) const { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp --- a/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -128,7 +128,7 @@ static Operation* DownloadInstanceGeometry(const std::string& instanceId) { - std::auto_ptr operation(new Operation(Mode_InstanceGeometry)); + std::unique_ptr operation(new Operation(Mode_InstanceGeometry)); operation->instanceId_ = instanceId; return operation.release(); } @@ -136,7 +136,7 @@ static Operation* DownloadFrameGeometry(const std::string& instanceId, unsigned int frame) { - std::auto_ptr operation(new Operation(Mode_FrameGeometry)); + std::unique_ptr operation(new Operation(Mode_FrameGeometry)); operation->instanceId_ = instanceId; operation->frame_ = frame; return operation.release(); @@ -146,7 +146,7 @@ const Slice& slice, SliceImageQuality quality) { - std::auto_ptr tmp(new Operation(Mode_LoadImage)); + std::unique_ptr tmp(new Operation(Mode_LoadImage)); tmp->sliceIndex_ = sliceIndex; tmp->slice_ = &slice; tmp->quality_ = quality; @@ -156,7 +156,7 @@ static Operation* DownloadSliceRawImage(unsigned int sliceIndex, const Slice& slice) { - std::auto_ptr tmp(new Operation(Mode_LoadRawImage)); + std::unique_ptr tmp(new Operation(Mode_LoadRawImage)); tmp->sliceIndex_ = sliceIndex; tmp->slice_ = &slice; tmp->quality_ = SliceImageQuality_InternalRaw; @@ -165,7 +165,7 @@ static Operation* DownloadDicomFile(const Slice& slice) { - std::auto_ptr tmp(new Operation(Mode_LoadDicomFile)); + std::unique_ptr tmp(new Operation(Mode_LoadDicomFile)); tmp->slice_ = &slice; return tmp.release(); } @@ -241,7 +241,7 @@ for (unsigned int frame = 0; frame < frames; frame++) { - std::auto_ptr slice(new Slice); + std::unique_ptr slice(new Slice); if (slice->ParseOrthancFrame(dicom, instances[i], frame)) { OrthancStone::CoordinateSystem3D geometry = slice->GetGeometry(); @@ -277,7 +277,7 @@ for (unsigned int frame = 0; frame < frames; frame++) { - std::auto_ptr slice(new Slice); + std::unique_ptr slice(new Slice); if (slice->ParseOrthancFrame(dicom, instanceId, frame)) { OrthancStone::CoordinateSystem3D geometry = slice->GetGeometry(); @@ -308,7 +308,7 @@ Orthanc::DicomMap dicom; MessagingToolbox::ConvertDataset(dicom, dataset); - std::auto_ptr slice(new Slice); + std::unique_ptr slice(new Slice); if (slice->ParseOrthancFrame(dicom, instanceId, frame)) { LOG(INFO) << "Loaded instance geometry " << instanceId; @@ -329,7 +329,7 @@ void OrthancSlicesLoader::ParseSliceImagePng(const OrthancApiClient::BinaryResponseReadyMessage& message) { const Operation& operation = dynamic_cast(message.GetPayload()); - std::auto_ptr image; + std::unique_ptr image; try { @@ -369,7 +369,7 @@ void OrthancSlicesLoader::ParseSliceImagePam(const OrthancApiClient::BinaryResponseReadyMessage& message) { const Operation& operation = dynamic_cast(message.GetPayload()); - std::auto_ptr image; + std::unique_ptr image; try { @@ -449,7 +449,7 @@ } } - std::auto_ptr reader; + std::unique_ptr reader; { std::string jpeg; @@ -536,7 +536,7 @@ } // Decode a grayscale JPEG 8bpp image coming from the Web viewer - std::auto_ptr image + std::unique_ptr image (new Orthanc::Image(expectedFormat, reader->GetWidth(), reader->GetHeight(), false)); Orthanc::ImageProcessing::Convert(*image, *reader); @@ -599,7 +599,7 @@ { // This is the case of RT-DOSE (uint32_t values) - std::auto_ptr image + std::unique_ptr image (new StringImage(Orthanc::PixelFormat_Grayscale32, info.GetWidth(), info.GetHeight(), raw)); @@ -623,7 +623,7 @@ info.GetPhotometricInterpretation() == Orthanc::PhotometricInterpretation_Monochrome2 && raw.size() == info.GetWidth() * info.GetHeight() * 2) { - std::auto_ptr image + std::unique_ptr image (new StringImage(Orthanc::PixelFormat_Grayscale16, info.GetWidth(), info.GetHeight(), raw)); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/ParallelSlices.cpp --- a/Framework/Deprecated/Toolbox/ParallelSlices.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/ParallelSlices.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -143,7 +143,7 @@ ParallelSlices* ParallelSlices::Reverse() const { - std::auto_ptr reversed(new ParallelSlices); + std::unique_ptr reversed(new ParallelSlices); for (size_t i = slices_.size(); i > 0; i--) { @@ -164,7 +164,7 @@ const OrthancStone::Vector dimensions = geometry.GetVoxelDimensions(OrthancStone::VolumeProjection_Axial); const OrthancStone::CoordinateSystem3D& axial = geometry.GetAxialGeometry(); - std::auto_ptr result(new ParallelSlices); + std::unique_ptr result(new ParallelSlices); switch (projection) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/ParallelSlicesCursor.h --- a/Framework/Deprecated/Toolbox/ParallelSlicesCursor.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/ParallelSlicesCursor.h Mon Mar 02 16:31:30 2020 +0100 @@ -24,12 +24,14 @@ #include "ParallelSlices.h" #include "../../StoneEnumerations.h" +#include + namespace Deprecated { class ParallelSlicesCursor : public boost::noncopyable { private: - std::auto_ptr slices_; + std::unique_ptr slices_; size_t currentSlice_; size_t GetDefaultSlice(); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/Slice.cpp --- a/Framework/Deprecated/Toolbox/Slice.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/Slice.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -48,7 +48,7 @@ Slice* Slice::Clone() const { - std::auto_ptr target(new Slice()); + std::unique_ptr target(new Slice()); target->type_ = type_; target->orthancInstanceId_ = orthancInstanceId_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Toolbox/Slice.h --- a/Framework/Deprecated/Toolbox/Slice.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Toolbox/Slice.h Mon Mar 02 16:31:30 2020 +0100 @@ -59,7 +59,7 @@ unsigned int height_; // TODO : Redundant with "imageInformation_" DicomFrameConverter converter_; // TODO : Partially redundant with "imageInformation_" - std::auto_ptr imageInformation_; + std::unique_ptr imageInformation_; public: Slice() : diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Viewport/WidgetViewport.h --- a/Framework/Deprecated/Viewport/WidgetViewport.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Viewport/WidgetViewport.h Mon Mar 02 16:31:30 2020 +0100 @@ -24,6 +24,8 @@ #include "IViewport.h" #include "../Widgets/IWidget.h" +#include + #include namespace Deprecated @@ -31,9 +33,9 @@ class WidgetViewport : public IViewport { private: - std::auto_ptr centralWidget_; + std::unique_ptr centralWidget_; IStatusBar* statusBar_; - std::auto_ptr mouseTracker_; + std::unique_ptr mouseTracker_; bool isMouseOver_; int lastMouseX_; int lastMouseY_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Volumes/StructureSetLoader.cpp --- a/Framework/Deprecated/Volumes/StructureSetLoader.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Volumes/StructureSetLoader.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -122,7 +122,7 @@ const std::string uri = "/instances/" + instanceId + "/tags?ignore-length=3006-0050"; OrthancPlugins::FullOrthancDataset dataset(orthanc, uri); - std::auto_ptr result + std::unique_ptr result (new OrthancStone::DicomStructureSet(dataset)); std::set instances; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Volumes/StructureSetLoader.h --- a/Framework/Deprecated/Volumes/StructureSetLoader.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Volumes/StructureSetLoader.h Mon Mar 02 16:31:30 2020 +0100 @@ -25,6 +25,8 @@ #include "../Toolbox/OrthancApiClient.h" #include "IVolumeLoader.h" +#include + namespace Deprecated { class StructureSetLoader : @@ -33,7 +35,7 @@ { private: OrthancApiClient& orthanc_; - std::auto_ptr structureSet_; + std::unique_ptr structureSet_; void OnReferencedSliceLoaded(const OrthancApiClient::JsonResponseReadyMessage& message); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Widgets/LayoutWidget.cpp --- a/Framework/Deprecated/Widgets/LayoutWidget.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/LayoutWidget.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -31,7 +31,7 @@ class LayoutWidget::LayoutMouseTracker : public IMouseTracker { private: - std::auto_ptr tracker_; + std::unique_ptr tracker_; int left_; int top_; unsigned int width_; @@ -85,7 +85,7 @@ class LayoutWidget::ChildWidget : public boost::noncopyable { private: - std::auto_ptr widget_; + std::unique_ptr widget_; int left_; int top_; unsigned int width_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Widgets/LayoutWidget.h --- a/Framework/Deprecated/Widgets/LayoutWidget.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/LayoutWidget.h Mon Mar 02 16:31:30 2020 +0100 @@ -38,7 +38,7 @@ bool isHorizontal_; unsigned int width_; unsigned int height_; - std::auto_ptr mouseTracker_; + std::unique_ptr mouseTracker_; unsigned int paddingLeft_; unsigned int paddingTop_; unsigned int paddingRight_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Widgets/SliceViewerWidget.cpp --- a/Framework/Deprecated/Widgets/SliceViewerWidget.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/SliceViewerWidget.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -327,7 +327,7 @@ { LOG(INFO) << "Updating layer " << index; - std::auto_ptr tmp(renderer); + std::unique_ptr tmp(renderer); if (renderer == NULL) { @@ -357,7 +357,12 @@ !currentScene_->IsComplete() || pendingScene_->IsComplete()) { - currentScene_ = pendingScene_; +#if __cplusplus < 201103L + currentScene_.reset(pendingScene_.release()); +#else + currentScene_ = std::move(pendingScene_); +#endif + NotifyContentChanged(); } } @@ -518,7 +523,11 @@ (pendingScene_.get() != NULL && pendingScene_->IsComplete())) { - currentScene_ = pendingScene_; +#if __cplusplus < 201103L + currentScene_.reset(pendingScene_.release()); +#else + currentScene_ = std::move(pendingScene_); +#endif } plane_ = plane; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Widgets/SliceViewerWidget.h --- a/Framework/Deprecated/Widgets/SliceViewerWidget.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/SliceViewerWidget.h Mon Mar 02 16:31:30 2020 +0100 @@ -75,8 +75,8 @@ std::vector layers_; std::vector styles_; OrthancStone::CoordinateSystem3D plane_; - std::auto_ptr currentScene_; - std::auto_ptr pendingScene_; + std::unique_ptr currentScene_; + std::unique_ptr pendingScene_; std::vector changedLayers_; bool LookupLayer(size_t& index /* out */, diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Widgets/TestWorldSceneWidget.h --- a/Framework/Deprecated/Widgets/TestWorldSceneWidget.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/TestWorldSceneWidget.h Mon Mar 02 16:31:30 2020 +0100 @@ -34,7 +34,7 @@ private: class Interactor; - std::auto_ptr interactor_; + std::unique_ptr interactor_; bool animate_; unsigned int count_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/Widgets/WorldSceneWidget.cpp --- a/Framework/Deprecated/Widgets/WorldSceneWidget.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/WorldSceneWidget.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -42,7 +42,7 @@ { private: ViewportGeometry view_; - std::auto_ptr tracker_; + std::unique_ptr tracker_; public: SceneMouseTracker(const ViewportGeometry& view, @@ -166,7 +166,7 @@ view_.MapPixelCenterToScene(sceneX, sceneY, x, y); // asks the Widget Interactor to provide a mouse tracker - std::auto_ptr tracker; + std::unique_ptr tracker; if (interactor_) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Deprecated/dev.h --- a/Framework/Deprecated/dev.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/dev.h Mon Mar 02 16:31:30 2020 +0100 @@ -47,8 +47,8 @@ { private: OrthancSlicesLoader loader_; - std::auto_ptr image_; - std::auto_ptr downloadStack_; + std::unique_ptr image_; + std::unique_ptr downloadStack_; bool computeRange_; size_t pendingSlices_; @@ -521,9 +521,9 @@ OrthancVolumeImage& volume_; - std::auto_ptr axialGeometry_; - std::auto_ptr coronalGeometry_; - std::auto_ptr sagittalGeometry_; + std::unique_ptr axialGeometry_; + std::unique_ptr coronalGeometry_; + std::unique_ptr sagittalGeometry_; bool IsGeometryReady() const @@ -662,7 +662,7 @@ { // As the slices of the volumic image are arranged in a box, // we only consider one single reference slice (the one with index 0). - std::auto_ptr slice(GetProjectionGeometry(projection).GetSlice(0)); + std::unique_ptr slice(GetProjectionGeometry(projection).GetSlice(0)); slice->GetExtent(points); return true; @@ -684,7 +684,7 @@ { bool isFullQuality = true; // TODO - std::auto_ptr frame; + std::unique_ptr frame; { OrthancStone::ImageBuffer3D::SliceReader reader(volume_.GetImage(), projection, static_cast(closest)); @@ -693,7 +693,7 @@ frame.reset(Orthanc::Image::Clone(reader.GetAccessor())); } - std::auto_ptr slice(geometry.GetSlice(closest)); + std::unique_ptr slice(geometry.GetSlice(closest)); RendererFactory factory(*frame, *slice, isFullQuality); @@ -716,7 +716,7 @@ private: SliceViewerWidget& widget_; OrthancStone::VolumeProjection projection_; - std::auto_ptr slices_; + std::unique_ptr slices_; size_t slice_; protected: @@ -858,7 +858,7 @@ { slice_ = slice; - std::auto_ptr tmp(slices_->GetSlice(slice_)); + std::unique_ptr tmp(slices_->GetSlice(slice_)); widget_.SetSlice(tmp->GetGeometry()); } } diff -r 86400fa16091 -r 8a0a62189f46 Framework/Fonts/FontRenderer.cpp --- a/Framework/Fonts/FontRenderer.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Fonts/FontRenderer.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -141,7 +141,7 @@ face_->glyph->bitmap.pitch, face_->glyph->bitmap.buffer); - std::auto_ptr glyph( + std::unique_ptr glyph( new Glyph(bitmap.GetWidth(), bitmap.GetHeight(), face_->glyph->bitmap_left, diff -r 86400fa16091 -r 8a0a62189f46 Framework/Fonts/Glyph.h --- a/Framework/Fonts/Glyph.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Fonts/Glyph.h Mon Mar 02 16:31:30 2020 +0100 @@ -21,6 +21,7 @@ #pragma once +#include #include #include @@ -38,7 +39,7 @@ int advanceX_; unsigned int lineHeight_; - std::auto_ptr payload_; + std::unique_ptr payload_; public: // WARNING: This does not copy the payload diff -r 86400fa16091 -r 8a0a62189f46 Framework/Fonts/GlyphAlphabet.cpp --- a/Framework/Fonts/GlyphAlphabet.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Fonts/GlyphAlphabet.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -43,12 +43,12 @@ const Glyph& glyph, Orthanc::IDynamicObject* payload) { - std::auto_ptr protection(payload); + std::unique_ptr protection(payload); // Don't add twice the same character if (content_.find(unicode) == content_.end()) { - std::auto_ptr raii(new Glyph(glyph)); + std::unique_ptr raii(new Glyph(glyph)); if (payload != NULL) { @@ -65,7 +65,7 @@ void GlyphAlphabet::Register(FontRenderer& renderer, uint32_t unicode) { - std::auto_ptr glyph(renderer.Render(unicode)); + std::unique_ptr glyph(renderer.Render(unicode)); if (glyph.get() != NULL) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Fonts/GlyphBitmapAlphabet.cpp --- a/Framework/Fonts/GlyphBitmapAlphabet.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Fonts/GlyphBitmapAlphabet.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -98,7 +98,7 @@ { TextBoundingBox box(alphabet_, utf8); - std::auto_ptr bitmap( + std::unique_ptr bitmap( new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, box.GetWidth(), box.GetHeight(), true /* force minimal pitch */)); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Fonts/GlyphTextureAlphabet.cpp --- a/Framework/Fonts/GlyphTextureAlphabet.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Fonts/GlyphTextureAlphabet.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -77,7 +77,7 @@ class GlyphTextureAlphabet::TextureGenerator : public GlyphAlphabet::IGlyphVisitor { private: - std::auto_ptr texture_; + std::unique_ptr texture_; unsigned int countColumns_; unsigned int countRows_; @@ -289,7 +289,7 @@ { TextBoundingBox box(alphabet_, utf8); - std::auto_ptr bitmap( + std::unique_ptr bitmap( new Orthanc::Image(Orthanc::PixelFormat_RGBA32, box.GetWidth(), box.GetHeight(), true /* force minimal pitch */)); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Fonts/GlyphTextureAlphabet.h --- a/Framework/Fonts/GlyphTextureAlphabet.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Fonts/GlyphTextureAlphabet.h Mon Mar 02 16:31:30 2020 +0100 @@ -61,7 +61,7 @@ class RenderTextVisitor; GlyphAlphabet alphabet_; - std::auto_ptr texture_; + std::unique_ptr texture_; unsigned int textureWidth_; unsigned int textureHeight_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/BasicFetchingStrategy.h --- a/Framework/Loaders/BasicFetchingStrategy.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/BasicFetchingStrategy.h Mon Mar 02 16:31:30 2020 +0100 @@ -24,6 +24,8 @@ #include "IFetchingItemsSorter.h" #include "IFetchingStrategy.h" +#include + #include namespace OrthancStone @@ -56,7 +58,7 @@ } }; - std::auto_ptr sorter_; + std::unique_ptr sorter_; std::vector nextQuality_; unsigned int maxQuality_; std::vector content_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/DicomStructureSetLoader.cpp --- a/Framework/Loaders/DicomStructureSetLoader.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/DicomStructureSetLoader.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -140,7 +140,7 @@ const std::string instanceId = lookup[0]["ID"].asString(); { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetHttpHeader("Accept-Encoding", "gzip"); std::string uri = "/instances/" + instanceId + "/tags"; command->SetUri(uri); @@ -227,7 +227,7 @@ for (std::set::const_iterator it = nonEmptyInstances.begin(); it != nonEmptyInstances.end(); ++it) { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetUri("/tools/lookup"); command->SetMethod(Orthanc::HttpMethod_Post); command->SetBody(*it); @@ -292,7 +292,7 @@ { assert(isValid_); - std::auto_ptr layer(new PolylineSceneLayer); + std::unique_ptr layer(new PolylineSceneLayer); layer->SetThickness(2); for (size_t i = 0; i < content_.GetStructuresCount(); i++) @@ -377,7 +377,7 @@ initiallyVisibleStructures_ = initiallyVisibleStructures; { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetHttpHeader("Accept-Encoding", "gzip"); std::string uri = "/instances/" + instanceId + "/tags?ignore-length=3006-0050"; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/DicomStructureSetLoader.h --- a/Framework/Loaders/DicomStructureSetLoader.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/DicomStructureSetLoader.h Mon Mar 02 16:31:30 2020 +0100 @@ -42,7 +42,7 @@ class LookupInstance; // 2nd state class LoadStructure; // 1st state - std::auto_ptr content_; + std::unique_ptr content_; uint64_t revision_; std::string instanceId_; unsigned int countProcessedInstances_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/DicomStructureSetLoader2.cpp --- a/Framework/Loaders/DicomStructureSetLoader2.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/DicomStructureSetLoader2.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -81,7 +81,7 @@ void DicomStructureSetLoader2::LoadInstance(const std::string& instanceId) { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetHttpHeader("Accept-Encoding", "gzip"); std::string uri = "/instances/" + instanceId + "/tags?ignore-length=3006-0050"; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/LoaderStateMachine.cpp --- a/Framework/Loaders/LoaderStateMachine.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/LoaderStateMachine.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -47,7 +47,7 @@ { LOG(TRACE) << "LoaderStateMachine(" << std::hex << this << std::dec << ")::Schedule()"; - std::auto_ptr protection(command); + std::unique_ptr protection(command); if (command == NULL) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/OrthancMultiframeVolumeLoader.cpp --- a/Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/OrthancMultiframeVolumeLoader.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -29,7 +29,7 @@ class OrthancMultiframeVolumeLoader::LoadRTDoseGeometry : public LoaderStateMachine::State { private: - std::auto_ptr dicom_; + std::unique_ptr dicom_; public: LoadRTDoseGeometry(OrthancMultiframeVolumeLoader& that, @@ -90,7 +90,7 @@ throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); } - std::auto_ptr dicom(new Orthanc::DicomMap); + std::unique_ptr dicom(new Orthanc::DicomMap); dicom->FromDicomAsJson(body); if (StringToSopClassUid(GetSopClassUid(*dicom)) == SopClassUid_RTDose) @@ -98,7 +98,7 @@ // Download the "Grid Frame Offset Vector" DICOM tag, that is // mandatory for RT-DOSE, but is too long to be returned by default - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetUri("/instances/" + loader.GetInstanceId() + "/content/" + Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR.Format()); command->SetPayload(new LoadRTDoseGeometry(loader, dicom.release())); @@ -171,7 +171,7 @@ transferSyntaxUid_ == "1.2.840.10008.1.2.1" || transferSyntaxUid_ == "1.2.840.10008.1.2.2") { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetHttpHeader("Accept-Encoding", "gzip"); command->SetUri("/instances/" + instanceId_ + "/content/" + Orthanc::DICOM_TAG_PIXEL_DATA.Format() + "/0"); @@ -563,7 +563,7 @@ instanceId_ = instanceId; { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetHttpHeader("Accept-Encoding", "gzip"); command->SetUri("/instances/" + instanceId + "/tags"); command->SetPayload(new LoadGeometry(*this)); @@ -571,7 +571,7 @@ } { - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetUri("/instances/" + instanceId + "/metadata/TransferSyntax"); command->SetPayload(new LoadTransferSyntax(*this)); Schedule(command.release()); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp --- a/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -261,11 +261,11 @@ throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); } - std::auto_ptr command; + std::unique_ptr command; if (quality == BEST_QUALITY) { - std::auto_ptr tmp(new GetOrthancImageCommand); + std::unique_ptr tmp(new GetOrthancImageCommand); // TODO: review the following comment. // - Commented out by bgo on 2019-07-19 | reason: Alain has seen cases // where gzipping the uint16 image took 11 sec to produce 5mb. @@ -281,7 +281,7 @@ } else { - std::auto_ptr tmp(new GetOrthancWebViewerJpegCommand); + std::unique_ptr tmp(new GetOrthancWebViewerJpegCommand); // TODO: review the following comment. Commented out by bgo on 2019-07-19 // (gzip for jpeg seems overkill) //tmp->SetHttpHeader("Accept-Encoding", "gzip"); @@ -325,7 +325,7 @@ Orthanc::DicomMap dicom; dicom.FromDicomAsJson(body[instances[i]]); - std::auto_ptr instance(new DicomInstanceParameters(dicom)); + std::unique_ptr instance(new DicomInstanceParameters(dicom)); instance->SetOrthancInstanceIdentifier(instances[i]); // the 3D plane corresponding to the slice @@ -481,7 +481,7 @@ { active_ = true; - std::auto_ptr command(new OrthancRestApiCommand); + std::unique_ptr command(new OrthancRestApiCommand); command->SetUri("/series/" + seriesId + "/instances-tags"); // LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::LoadSeries about to call oracle_.Schedule"; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h --- a/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h Mon Mar 02 16:31:30 2020 +0100 @@ -67,7 +67,7 @@ void CheckSliceIndex(size_t index) const; - std::auto_ptr geometry_; + std::unique_ptr geometry_; std::vector slices_; std::vector slicesRevision_; @@ -111,8 +111,8 @@ unsigned int simultaneousDownloads_; SeriesGeometry seriesGeometry_; boost::shared_ptr volume_; - std::auto_ptr sorter_; - std::auto_ptr strategy_; + std::unique_ptr sorter_; + std::unique_ptr strategy_; std::vector slicesQuality_; bool volumeImageReadyInHighQuality_; diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/GetOrthancImageCommand.cpp --- a/Framework/Oracle/GetOrthancImageCommand.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/GetOrthancImageCommand.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -102,7 +102,7 @@ } } - std::auto_ptr image; + std::unique_ptr image; switch (contentType) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/GetOrthancImageCommand.h --- a/Framework/Oracle/GetOrthancImageCommand.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/GetOrthancImageCommand.h Mon Mar 02 16:31:30 2020 +0100 @@ -40,7 +40,7 @@ ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); private: - std::auto_ptr image_; + std::unique_ptr image_; Orthanc::MimeType mime_; public: diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp --- a/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -126,7 +126,7 @@ } } - std::auto_ptr reader; + std::unique_ptr reader; { std::string jpeg; @@ -197,7 +197,7 @@ } // Decode a grayscale JPEG 8bpp image coming from the Web viewer - std::auto_ptr image + std::unique_ptr image (new Orthanc::Image(expectedFormat_, reader->GetWidth(), reader->GetHeight(), false)); Orthanc::ImageProcessing::Convert(*image, *reader); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/GetOrthancWebViewerJpegCommand.h --- a/Framework/Oracle/GetOrthancWebViewerJpegCommand.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/GetOrthancWebViewerJpegCommand.h Mon Mar 02 16:31:30 2020 +0100 @@ -40,7 +40,7 @@ ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); private: - std::auto_ptr image_; + std::unique_ptr image_; public: SuccessMessage(const GetOrthancWebViewerJpegCommand& command, diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/OracleCommandWithPayload.h --- a/Framework/Oracle/OracleCommandWithPayload.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/OracleCommandWithPayload.h Mon Mar 02 16:31:30 2020 +0100 @@ -23,6 +23,7 @@ #include "IOracleCommand.h" +#include #include #include @@ -32,7 +33,7 @@ class OracleCommandWithPayload : public IOracleCommand { private: - std::auto_ptr payload_; + std::unique_ptr payload_; public: void SetPayload(Orthanc::IDynamicObject* payload); diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/ThreadedOracle.cpp --- a/Framework/Oracle/ThreadedOracle.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/ThreadedOracle.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -40,7 +40,7 @@ { private: const IObserver& receiver_; - std::auto_ptr command_; + std::unique_ptr command_; public: Item(const IObserver& receiver, @@ -74,7 +74,7 @@ { private: const IObserver& receiver_; - std::auto_ptr command_; + std::unique_ptr command_; boost::posix_time::ptime expiration_; public: @@ -310,7 +310,7 @@ void ThreadedOracle::Step() { - std::auto_ptr object(queue_.Dequeue(100)); + std::unique_ptr object(queue_.Dequeue(100)); if (object.get() != NULL) { @@ -324,7 +324,7 @@ { SleepOracleCommand& command = dynamic_cast(item.GetCommand()); - std::auto_ptr copy(new SleepOracleCommand(command.GetDelay())); + std::unique_ptr copy(new SleepOracleCommand(command.GetDelay())); if (command.HasPayload()) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Oracle/WebAssemblyOracle.cpp --- a/Framework/Oracle/WebAssemblyOracle.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Oracle/WebAssemblyOracle.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -43,7 +43,7 @@ private: WebAssemblyOracle& oracle_; const IObserver& receiver_; - std::auto_ptr command_; + std::unique_ptr command_; public: TimeoutContext(WebAssemblyOracle& oracle, @@ -70,7 +70,7 @@ static void Callback(void *userData) { - std::auto_ptr context(reinterpret_cast(userData)); + std::unique_ptr context(reinterpret_cast(userData)); context->EmitMessage(); } }; @@ -110,7 +110,7 @@ private: Emitter emitter_; const IObserver& receiver_; - std::auto_ptr command_; + std::unique_ptr command_; std::string expectedContentType_; int64_t receiverFingerprint_; @@ -213,7 +213,7 @@ * free data associated with the fetch. **/ - std::auto_ptr context(reinterpret_cast(fetch->userData)); + std::unique_ptr context(reinterpret_cast(fetch->userData)); // an UUID is 36 chars : 32 hex chars + 4 hyphens: char #0 --> char #35 // char #36 is \0. @@ -352,7 +352,7 @@ static void FailureCallback(emscripten_fetch_t *fetch) { - std::auto_ptr context(reinterpret_cast(fetch->userData)); + std::unique_ptr context(reinterpret_cast(fetch->userData)); { const size_t kEmscriptenStatusTextSize = sizeof(emscripten_fetch_t::statusText); @@ -389,7 +389,7 @@ private: WebAssemblyOracle& oracle_; const IObserver& receiver_; - std::auto_ptr command_; + std::unique_ptr command_; Orthanc::HttpMethod method_; std::string url_; std::string body_; @@ -702,7 +702,7 @@ << std::hex << &receiver << std::dec << " | Current fingerprint is " << receiver.GetFingerprint(); - std::auto_ptr protection(command); + std::unique_ptr protection(command); if (command == NULL) { diff -r 86400fa16091 -r 8a0a62189f46 Framework/Radiography/RadiographyAlphaLayer.cpp --- a/Framework/Radiography/RadiographyAlphaLayer.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Radiography/RadiographyAlphaLayer.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -23,8 +23,10 @@ #include "RadiographyScene.h" +#include