diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-10-26 15:22:31 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-10-27 18:30:58 -0700 |
commit | 62b56b799a7d4fcd1a8f151eed878054b862da5b (patch) | |
tree | 34d510a69f9dd1bca30e9b137feffbd1eb6495d0 /include/mbgl/platform | |
parent | ef8017198ce8f0bd79ba5a5ed31e35a16e3433bb (diff) | |
download | qtlocation-mapboxgl-62b56b799a7d4fcd1a8f151eed878054b862da5b.tar.gz |
[core] change std::array<uint16_t, 2> to mbgl::Size
Diffstat (limited to 'include/mbgl/platform')
-rw-r--r-- | include/mbgl/platform/default/glfw_view.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/platform/default/offscreen_view.hpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index e832cd70d1..c640f188f9 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -34,8 +34,8 @@ public: // mbgl::View implementation void updateViewBinding(); void bind() override; - std::array<uint16_t, 2> getSize() const; - std::array<uint16_t, 2> getFramebufferSize() const; + mbgl::Size getSize() const; + mbgl::Size getFramebufferSize() const; // mbgl::Backend implementation void activate() override; diff --git a/include/mbgl/platform/default/offscreen_view.hpp b/include/mbgl/platform/default/offscreen_view.hpp index 034aa3aaf3..0e839e14cc 100644 --- a/include/mbgl/platform/default/offscreen_view.hpp +++ b/include/mbgl/platform/default/offscreen_view.hpp @@ -14,17 +14,17 @@ class Context; class OffscreenView : public View { public: - OffscreenView(gl::Context&, std::array<uint16_t, 2> size = {{ 256, 256 }}); + OffscreenView(gl::Context&, Size size = { 256, 256 }); void bind() override; PremultipliedImage readStillImage(); - std::array<uint16_t, 2> getSize() const; +public: + const Size size; private: gl::Context& context; - std::array<uint16_t, 2> size; optional<gl::Framebuffer> framebuffer; optional<gl::Renderbuffer<gl::RenderbufferType::RGBA>> color; optional<gl::Renderbuffer<gl::RenderbufferType::DepthStencil>> depthStencil; |