Mercurial > hg > orthanc-stone

comparison Framework/Scene2D/CairoCompositor.h @ 1299:c38c89684d83 broker

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 17:21:24 +0100
parents 7ec8fea061b9
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
35 private Internals::ICairoContextProvider 35 private Internals::ICairoContextProvider
36 { 36 {
37 private: 37 private:
38 typedef std::map<size_t, GlyphBitmapAlphabet*> Fonts; 38 typedef std::map<size_t, GlyphBitmapAlphabet*> Fonts;
39 39
40 std::auto_ptr<Internals::CompositorHelper> helper_; 40 std::unique_ptr<Internals::CompositorHelper> helper_;
41 CairoSurface canvas_; 41 CairoSurface canvas_;
42 Fonts fonts_; 42 Fonts fonts_;
43 43
44 // Only valid during a call to "Refresh()" 44 // Only valid during a call to "Refresh()"
45 std::auto_ptr<CairoContext> context_; 45 std::unique_ptr<CairoContext> context_;
46 46
47 virtual cairo_t* GetCairoContext() ORTHANC_OVERRIDE; 47 virtual cairo_t* GetCairoContext() ORTHANC_OVERRIDE;
48 48
49 virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer) ORTHANC_OVERRIDE; 49 virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer) ORTHANC_OVERRIDE;
50 50