Mercurial > hg > orthanc-stone
comparison Samples/Sdl/RtViewer/RtViewerSdl.cpp @ 1507:169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 06 Jul 2020 16:47:40 +0200 |
parents | 28c64c246312 |
children |
comparison
equal
deleted
inserted
replaced
1506:f88265c3f8a0 | 1507:169adf9090a6 |
---|---|
30 #include "../../../Framework/OpenGL/SdlOpenGLContext.h" | 30 #include "../../../Framework/OpenGL/SdlOpenGLContext.h" |
31 #include "../../../Framework/StoneException.h" | 31 #include "../../../Framework/StoneException.h" |
32 #include "../../../Framework/StoneInitialization.h" | 32 #include "../../../Framework/StoneInitialization.h" |
33 | 33 |
34 // Orthanc (a.o. for screenshot capture) | 34 // Orthanc (a.o. for screenshot capture) |
35 #include <Compatibility.h> // For std::unique_ptr<> | |
35 #include <Images/Image.h> | 36 #include <Images/Image.h> |
36 #include <Images/ImageProcessing.h> | 37 #include <Images/ImageProcessing.h> |
37 #include <Images/PngWriter.h> | 38 #include <Images/PngWriter.h> |
38 | 39 |
39 | 40 |
358 sdlEvent.type == SDL_MOUSEBUTTONUP) | 359 sdlEvent.type == SDL_MOUSEBUTTONUP) |
359 { | 360 { |
360 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId( | 361 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId( |
361 views, sdlEvent.window.windowID); | 362 views, sdlEvent.window.windowID); |
362 | 363 |
363 std::auto_ptr<OrthancStone::IViewport::ILock> lock(view->GetViewport()->Lock()); | 364 std::unique_ptr<OrthancStone::IViewport::ILock> lock(view->GetViewport()->Lock()); |
364 if (lock->HasCompositor()) | 365 if (lock->HasCompositor()) |
365 { | 366 { |
366 OrthancStone::PointerEvent p; | 367 OrthancStone::PointerEvent p; |
367 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(), | 368 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(), |
368 sdlEvent, keyboardState, scancodeCount); | 369 sdlEvent, keyboardState, scancodeCount); |