diff Framework/Scene2D/OpenGLCompositor.cpp @ 1308:adf234ecaa00 broker

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 257f2c9a02ac
children 4f8db2d202c8
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.cpp	Wed Mar 04 10:07:37 2020 +0100
+++ b/Framework/Scene2D/OpenGLCompositor.cpp	Wed Mar 04 10:21:54 2020 +0100
@@ -33,8 +33,8 @@
   class OpenGLCompositor::Font : public boost::noncopyable
   {
   private:
-    std::auto_ptr<GlyphTextureAlphabet>   alphabet_;
-    std::auto_ptr<OpenGL::OpenGLTexture>  texture_;
+    std::unique_ptr<GlyphTextureAlphabet>   alphabet_;
+    std::unique_ptr<OpenGL::OpenGLTexture>  texture_;
 
   public:
     Font(OpenGL::IOpenGLContext& context, const GlyphBitmapAlphabet& dict)
@@ -42,7 +42,7 @@
       alphabet_.reset(new GlyphTextureAlphabet(dict));
       texture_.reset(new OpenGL::OpenGLTexture(context));
 
-      std::auto_ptr<Orthanc::ImageAccessor> bitmap(alphabet_->ReleaseTexture());
+      std::unique_ptr<Orthanc::ImageAccessor> bitmap(alphabet_->ReleaseTexture());
       texture_->Load(*bitmap, true /* enable linear interpolation */);
     }
 
@@ -185,7 +185,7 @@
     {
       context_.MakeCurrent(); // this can throw if context lost
 
-      std::auto_ptr<Font> font(new Font(context_, dict));
+      std::unique_ptr<Font> font(new Font(context_, dict));
 
       Fonts::iterator found = fonts_.find(index);