comparison 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
comparison
equal deleted inserted replaced
887:6176917ef890 889:6e79e8c9021c
70 Orthanc::EmbeddedResources::FileResourceId resource, 70 Orthanc::EmbeddedResources::FileResourceId resource,
71 unsigned int fontSize, 71 unsigned int fontSize,
72 Orthanc::Encoding codepage); 72 Orthanc::Encoding codepage);
73 #endif 73 #endif
74 74
75 virtual unsigned int GetWidth() const 75 virtual unsigned int GetCanvasWidth() const
76 { 76 {
77 return canvasWidth_; 77 return canvasWidth_;
78 } 78 }
79 79
80 unsigned int GetHeight() const 80 virtual unsigned int GetCanvasHeight() const
81 { 81 {
82 return canvasHeight_; 82 return canvasHeight_;
83 } 83 }
84
85 }; 84 };
86 } 85 }