diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2015-03-17 17:45:09 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2015-03-17 17:45:09 -0700 |
commit | 76f8a3d8468c623956c291ac7837e322b317a8f3 (patch) | |
tree | 8f0f9ec780ea7866dd3561f10245807fc35cb421 /src | |
parent | e049ce6df13c3ad77e9e2ecb2e1afe2992384a35 (diff) | |
download | qtlocation-mapboxgl-76f8a3d8468c623956c291ac7837e322b317a8f3.tar.gz |
fix passing of annotation manager
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/live_tile_data.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/map/live_tile_data.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/map/source.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/map/live_tile_data.cpp b/src/mbgl/map/live_tile_data.cpp index 34743f02ce..92777f67f0 100644 --- a/src/mbgl/map/live_tile_data.cpp +++ b/src/mbgl/map/live_tile_data.cpp @@ -8,7 +8,7 @@ using namespace mbgl; LiveTileData::LiveTileData(Tile::ID const& id_, - util::ptr<AnnotationManager> annotationManager_, + AnnotationManager& annotationManager_, float mapMaxZoom, util::ptr<Style> style_, GlyphAtlas& glyphAtlas_, @@ -37,7 +37,7 @@ void LiveTileData::parse() { } if (source.type == SourceType::Annotations) { - const std::unique_ptr<LiveTile>& tile = annotationManager->getTile(id); + const std::unique_ptr<LiveTile>& tile = annotationManager.getTile(id); if (tile) { // Parsing creates state that is encapsulated in TileParser. While parsing, diff --git a/src/mbgl/map/live_tile_data.hpp b/src/mbgl/map/live_tile_data.hpp index 11530ef847..6b9d0a047a 100644 --- a/src/mbgl/map/live_tile_data.hpp +++ b/src/mbgl/map/live_tile_data.hpp @@ -10,7 +10,7 @@ class AnnotationManager; class LiveTileData : public VectorTileData { public: LiveTileData(Tile::ID const&, - util::ptr<AnnotationManager>, + AnnotationManager&, float mapMaxZoom, util::ptr<Style>, GlyphAtlas&, @@ -24,7 +24,7 @@ public: void parse() override; private: - util::ptr<AnnotationManager> annotationManager; + AnnotationManager& annotationManager; }; } diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp index 982b084e17..b13a76c205 100644 --- a/src/mbgl/map/source.cpp +++ b/src/mbgl/map/source.cpp @@ -196,7 +196,7 @@ TileData::State Source::addTile(Map &map, Environment &env, uv::worker &worker, new_tile.data = std::make_shared<RasterTileData>(normalized_id, texturePool, info, env); new_tile.data->request(worker, map.getState().getPixelRatio(), callback); } else if (info.type == SourceType::Annotations) { - util::ptr<AnnotationManager> annotationManager = map.getAnnotationManager(); + AnnotationManager& annotationManager = map.getAnnotationManager(); new_tile.data = std::make_shared<LiveTileData>(normalized_id, annotationManager, map.getMaxZoom(), style, |