diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-21 16:36:31 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-25 12:17:00 -0700 |
| commit | 8ea2b78b8a06107d84436873256c52309e6ebb7e (patch) | |
| tree | b29cb24b6db45cee0124ba92d8157d00c8f4a516 /platform/default | |
| parent | f49e0f97e21d19f11d74057184713f568cea170b (diff) | |
| download | qtlocation-mapboxgl-8ea2b78b8a06107d84436873256c52309e6ebb7e.tar.gz | |
[all] Merge View into RendererBackendupstream/headless-frontend
Diffstat (limited to 'platform/default')
| -rw-r--r-- | platform/default/mbgl/gl/headless_backend.hpp | 3 | ||||
| -rw-r--r-- | platform/default/mbgl/gl/headless_frontend.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp index d845e9930c..8d86ea8c47 100644 --- a/platform/default/mbgl/gl/headless_backend.hpp +++ b/platform/default/mbgl/gl/headless_backend.hpp @@ -1,6 +1,5 @@ #pragma once -#include <mbgl/map/view.hpp> #include <mbgl/renderer/renderer_backend.hpp> #include <memory> @@ -10,7 +9,7 @@ namespace mbgl { class HeadlessDisplay; -class HeadlessBackend : public View, public RendererBackend { +class HeadlessBackend : public RendererBackend { public: HeadlessBackend(Size = { 256, 256 }); ~HeadlessBackend() override; diff --git a/platform/default/mbgl/gl/headless_frontend.cpp b/platform/default/mbgl/gl/headless_frontend.cpp index 3f34d8eeba..ad03706be7 100644 --- a/platform/default/mbgl/gl/headless_frontend.cpp +++ b/platform/default/mbgl/gl/headless_frontend.cpp @@ -17,7 +17,7 @@ HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, FileSource& fi asyncInvalidate([this] { if (renderer && updateParameters) { mbgl::BackendScope guard { backend }; - renderer->render(backend, *updateParameters); + renderer->render(*updateParameters); } }), renderer(std::make_unique<Renderer>(backend, pixelRatio, fileSource, scheduler)) { |