diff Framework/Scene2D/OpenGLCompositor.h @ 889:6e79e8c9021c am-dev

integration mainline->am-dev
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jul 2019 12:05:02 +0200
parents 80829436ce0c
children 9c2f6d6b9f4a
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.h	Wed Jul 10 11:29:53 2019 +0200
+++ b/Framework/Scene2D/OpenGLCompositor.h	Wed Jul 10 12:05:02 2019 +0200
@@ -72,15 +72,14 @@
                  Orthanc::Encoding codepage);
 #endif
 
-    virtual unsigned int GetWidth() const
+    virtual unsigned int GetCanvasWidth() const
     {
       return canvasWidth_;
     }
 
-    unsigned int GetHeight() const
+    virtual unsigned int GetCanvasHeight() const
     {
       return canvasHeight_;
     }
-
   };
 }