diff options
Diffstat (limited to 'platform/default/offscreen_view.cpp')
-rw-r--r-- | platform/default/offscreen_view.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/platform/default/offscreen_view.cpp b/platform/default/offscreen_view.cpp index eaf87d0f87..613e00fc2b 100644 --- a/platform/default/offscreen_view.cpp +++ b/platform/default/offscreen_view.cpp @@ -7,9 +7,9 @@ namespace mbgl { -OffscreenView::OffscreenView(gl::Context& context_, std::array<uint16_t, 2> size_) - : context(context_), size(std::move(size_)) { - assert(size[0] > 0 && size[1] > 0); +OffscreenView::OffscreenView(gl::Context& context_, const Size size_) + : size(std::move(size_)), context(context_) { + assert(size); } void OffscreenView::bind() { @@ -21,17 +21,17 @@ void OffscreenView::bind() { context.bindFramebuffer = framebuffer->framebuffer; } - context.viewport = { 0, 0, size[0], size[1] }; + context.viewport = { 0, 0, size }; } PremultipliedImage OffscreenView::readStillImage() { - PremultipliedImage image { size[0], size[1] }; - MBGL_CHECK_ERROR(glReadPixels(0, 0, size[0], size[1], GL_RGBA, GL_UNSIGNED_BYTE, image.data.get())); + PremultipliedImage image { size }; + MBGL_CHECK_ERROR(glReadPixels(0, 0, size.width, size.height, GL_RGBA, GL_UNSIGNED_BYTE, image.data.get())); const auto stride = image.stride(); auto tmp = std::make_unique<uint8_t[]>(stride); uint8_t* rgba = image.data.get(); - for (int i = 0, j = size[1] - 1; i < j; i++, j--) { + for (int i = 0, j = size.height - 1; i < j; i++, j--) { std::memcpy(tmp.get(), rgba + i * stride, stride); std::memcpy(rgba + i * stride, rgba + j * stride, stride); std::memcpy(rgba + j * stride, tmp.get(), stride); @@ -40,8 +40,4 @@ PremultipliedImage OffscreenView::readStillImage() { return image; } -std::array<uint16_t, 2> OffscreenView::getSize() const { - return size; -} - } // namespace mbgl |