comparison Applications/Sdl/SdlOrthancSurface.h @ 1308:adf234ecaa00 broker

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 257f2c9a02ac
children
comparison
equal deleted inserted replaced
1307:8a28a9bf8876 1308:adf234ecaa00
23 23
24 #if ORTHANC_ENABLE_SDL == 1 24 #if ORTHANC_ENABLE_SDL == 1
25 25
26 #include "../../Framework/Viewport/SdlWindow.h" 26 #include "../../Framework/Viewport/SdlWindow.h"
27 27
28 #include <Core/Compatibility.h>
28 #include <Core/Images/ImageAccessor.h> 29 #include <Core/Images/ImageAccessor.h>
30
29 #include <boost/thread/mutex.hpp> 31 #include <boost/thread/mutex.hpp>
30 32
31 namespace OrthancStone 33 namespace OrthancStone
32 { 34 {
33 class SdlOrthancSurface : public boost::noncopyable 35 class SdlOrthancSurface : public boost::noncopyable
34 { 36 {
35 private: 37 private:
36 std::auto_ptr<Orthanc::ImageAccessor> image_; 38 std::unique_ptr<Orthanc::ImageAccessor> image_;
37 SdlWindow& window_; 39 SdlWindow& window_;
38 SDL_Surface* sdlSurface_; 40 SDL_Surface* sdlSurface_;
39 41
40 public: 42 public:
41 SdlOrthancSurface(SdlWindow& window); 43 SdlOrthancSurface(SdlWindow& window);