Mercurial > hg > orthanc-stone
diff Framework/Scene2D/CairoCompositor.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 | d10d2acb8a02 2d8ab34c8c91 |
line wrap: on
line diff
--- a/Framework/Scene2D/CairoCompositor.h Wed Jul 31 11:29:08 2019 +0200 +++ b/Framework/Scene2D/CairoCompositor.h Mon Aug 05 12:27:27 2019 +0200 @@ -44,9 +44,9 @@ // Only valid during a call to "Refresh()" std::auto_ptr<CairoContext> context_; - virtual cairo_t* GetCairoContext(); + virtual cairo_t* GetCairoContext() ORTHANC_OVERRIDE; - virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer); + virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer) ORTHANC_OVERRIDE; public: CairoCompositor(const Scene2D& scene, @@ -60,27 +60,27 @@ return canvas_; } - virtual unsigned int GetCanvasWidth() const + virtual unsigned int GetCanvasWidth() const ORTHANC_OVERRIDE { return canvas_.GetWidth(); } - virtual unsigned int GetCanvasHeight() const + virtual unsigned int GetCanvasHeight() const ORTHANC_OVERRIDE { return canvas_.GetHeight(); } void SetFont(size_t index, - GlyphBitmapAlphabet* dict); // Takes ownership + GlyphBitmapAlphabet* dict); // Takes ownership #if ORTHANC_ENABLE_LOCALE == 1 virtual void SetFont(size_t index, Orthanc::EmbeddedResources::FileResourceId resource, unsigned int fontSize, - Orthanc::Encoding codepage); + Orthanc::Encoding codepage) ORTHANC_OVERRIDE; #endif - virtual void Refresh(); + virtual void Refresh() ORTHANC_OVERRIDE; void UpdateSize(unsigned int canvasWidth, unsigned int canvasHeight);