summaryrefslogtreecommitdiff
path: root/platform/glfw
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-06-13 10:50:16 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-07-18 10:45:12 +0200
commit39a732d7ae3cb1b927d94c4b1154b42d9565356a (patch)
tree5f33317467cb3dbdf19be3a8264818ff34f859eb /platform/glfw
parent57351c068b133ed140ac7b991181672019fe5c24 (diff)
downloadqtlocation-mapboxgl-39a732d7ae3cb1b927d94c4b1154b42d9565356a.tar.gz
[android][glfw][ios][macos][node][qt] split backend from mapobserver
Diffstat (limited to 'platform/glfw')
-rw-r--r--platform/glfw/glfw_view.hpp2
-rw-r--r--platform/glfw/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index 366fe4fd68..3b0c31009c 100644
--- a/platform/glfw/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
@@ -9,7 +9,7 @@
struct GLFWwindow;
-class GLFWView : public mbgl::View, public mbgl::Backend {
+class GLFWView : public mbgl::View, public mbgl::Backend, public mbgl::MapObserver {
public:
GLFWView(bool fullscreen = false, bool benchmark = false);
~GLFWView() override;
diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp
index 7192475835..0cd9543f9c 100644
--- a/platform/glfw/main.cpp
+++ b/platform/glfw/main.cpp
@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
mbgl::ThreadPool threadPool(4);
- mbgl::Map map(backend, view->getSize(), view->getPixelRatio(), fileSource, threadPool);
+ mbgl::Map map(backend, backend, view->getSize(), view->getPixelRatio(), fileSource, threadPool);
backend.setMap(&map);
@@ -200,4 +200,4 @@ int main(int argc, char *argv[]) {
view = nullptr;
return 0;
-} \ No newline at end of file
+}