Mercurial > hg > orthanc-stone
diff Framework/Scene2D/OpenGLCompositor.h @ 942:685c9a2d115f
Added missing ORTHANC_OVERRIDE + preparation for lost GL context handling + stubs for GL context event handlers
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 05 Aug 2019 12:27:27 +0200 |
parents | 64e5f3ff6360 |
children | 1091b2adeb5a |
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.h Wed Jul 31 11:29:08 2019 +0200 +++ b/Framework/Scene2D/OpenGLCompositor.h Mon Aug 05 12:27:27 2019 +0200 @@ -30,9 +30,7 @@ namespace OrthancStone { - class OpenGLCompositor : - public ICompositor, - private Internals::CompositorHelper::IRendererFactory + class OpenGLCompositor : public ICompositor, private Internals::CompositorHelper::IRendererFactory { private: class Font; @@ -51,7 +49,7 @@ const Font* GetFont(size_t fontIndex) const; - virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer); + virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer) ORTHANC_OVERRIDE; public: OpenGLCompositor(OpenGL::IOpenGLContext& context, @@ -59,7 +57,7 @@ virtual ~OpenGLCompositor(); - virtual void Refresh(); + virtual void Refresh() ORTHANC_OVERRIDE; void SetFont(size_t index, const GlyphBitmapAlphabet& dict); @@ -68,15 +66,15 @@ void SetFont(size_t index, Orthanc::EmbeddedResources::FileResourceId resource, unsigned int fontSize, - Orthanc::Encoding codepage); + Orthanc::Encoding codepage) ORTHANC_OVERRIDE; #endif - virtual unsigned int GetCanvasWidth() const + virtual unsigned int GetCanvasWidth() const ORTHANC_OVERRIDE { return canvasWidth_; } - virtual unsigned int GetCanvasHeight() const + virtual unsigned int GetCanvasHeight() const ORTHANC_OVERRIDE { return canvasHeight_; }