Mercurial > hg > orthanc-stone

comparison Framework/Scene2D/OpenGLCompositor.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 28c64c246312
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
37 37
38 typedef std::map<size_t, Font*> Fonts; 38 typedef std::map<size_t, Font*> Fonts;
39 39
40 OpenGL::IOpenGLContext& context_; 40 OpenGL::IOpenGLContext& context_;
41 Fonts fonts_; 41 Fonts fonts_;
42 std::auto_ptr<Internals::CompositorHelper> helper_; 42 std::unique_ptr<Internals::CompositorHelper> helper_;
43 Internals::OpenGLColorTextureProgram colorTextureProgram_; 43 Internals::OpenGLColorTextureProgram colorTextureProgram_;
44 Internals::OpenGLFloatTextureProgram floatTextureProgram_; 44 Internals::OpenGLFloatTextureProgram floatTextureProgram_;
45 Internals::OpenGLLinesProgram linesProgram_; 45 Internals::OpenGLLinesProgram linesProgram_;
46 Internals::OpenGLTextProgram textProgram_; 46 Internals::OpenGLTextProgram textProgram_;
47 unsigned int canvasWidth_; 47 unsigned int canvasWidth_;