Mercurial > hg > orthanc-stone

diff Framework/Scene2D/OpenGLCompositor.h @ 897:9c2f6d6b9f4a am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Alain Mazy <alain@mazy.be>
date Tue, 16 Jul 2019 12:37:29 +0200
parents 6e79e8c9021c 0aff28f15ea2
children 64e5f3ff6360
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.h	Fri Jul 12 14:57:48 2019 +0200
+++ b/Framework/Scene2D/OpenGLCompositor.h	Tue Jul 16 12:37:29 2019 +0200
@@ -29,9 +29,7 @@
 
 namespace OrthancStone
 {
-  class OpenGLCompositor :
-      public ICompositor,
-      private Internals::CompositorHelper::IRendererFactory
+  class OpenGLCompositor : private Internals::CompositorHelper::IRendererFactory
   {
   private:
     class Font;
@@ -58,9 +56,7 @@
 
     ~OpenGLCompositor();
 
-    void UpdateSize();
-
-    virtual void Refresh();
+    void Refresh();
 
     void SetFont(size_t index,
                  const GlyphBitmapAlphabet& dict);
@@ -72,12 +68,12 @@
                  Orthanc::Encoding codepage);
 #endif
 
-    virtual unsigned int GetCanvasWidth() const
+    unsigned int GetCanvasWidth() const
     {
       return canvasWidth_;
     }
 
-    virtual unsigned int GetCanvasHeight() const
+    unsigned int GetCanvasHeight() const
     {
       return canvasHeight_;
     }