Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/Internals/OpenGLTextureProgram.h @ 1298:8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 16:31:30 +0100 |
parents | 2d8ab34c8c91 |
children | 257f2c9a02ac |
comparison
equal
deleted
inserted
replaced
1296:86400fa16091 | 1298:8a0a62189f46 |
---|---|
24 #include "../../OpenGL/IOpenGLContext.h" | 24 #include "../../OpenGL/IOpenGLContext.h" |
25 #include "../../OpenGL/OpenGLProgram.h" | 25 #include "../../OpenGL/OpenGLProgram.h" |
26 #include "../../OpenGL/OpenGLTexture.h" | 26 #include "../../OpenGL/OpenGLTexture.h" |
27 #include "../../Toolbox/AffineTransform2D.h" | 27 #include "../../Toolbox/AffineTransform2D.h" |
28 | 28 |
29 #include <Core/Compatibility.h> | |
30 | |
29 namespace OrthancStone | 31 namespace OrthancStone |
30 { | 32 { |
31 namespace Internals | 33 namespace Internals |
32 { | 34 { |
33 class OpenGLTextureProgram : public boost::noncopyable | 35 class OpenGLTextureProgram : public boost::noncopyable |
34 { | 36 { |
35 private: | 37 private: |
36 OpenGL::IOpenGLContext& context_; | 38 OpenGL::IOpenGLContext& context_; |
37 std::auto_ptr<OpenGL::OpenGLProgram> program_; | 39 std::unique_ptr<OpenGL::OpenGLProgram> program_; |
38 GLint positionLocation_; | 40 GLint positionLocation_; |
39 GLint textureLocation_; | 41 GLint textureLocation_; |
40 GLuint buffers_[2]; | 42 GLuint buffers_[2]; |
41 | 43 |
42 void InitializeExecution(OpenGL::OpenGLTexture& texture, | 44 void InitializeExecution(OpenGL::OpenGLTexture& texture, |