summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-01-22 13:06:30 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-01-22 13:06:30 -0800
commita8b6e3dc7157015b3724657677e30287c9e9b6c0 (patch)
tree9f8e366e98d1d058b7a376c27e41e149c020a964 /include
parent9495b686e7e7e8cdfc429168d5b28758ed620a7d (diff)
parent4791bac6753e16ef910a47c514e48b355e20295f (diff)
downloadqtlocation-mapboxgl-a8b6e3dc7157015b3724657677e30287c9e9b6c0.tar.gz
Merge remote-tracking branch 'origin/dash-3' into v7
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/map/map.hpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 62c4abc232..a07941b2f2 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -30,6 +30,7 @@ class FileSource;
class View;
class GlyphAtlas;
class SpriteAtlas;
+class LineAtlas;
class Map : private util::noncopyable {
public:
@@ -185,6 +186,7 @@ private:
util::ptr<GlyphStore> glyphStore;
const std::unique_ptr<SpriteAtlas> spriteAtlas;
util::ptr<Sprite> sprite;
+ const std::unique_ptr<LineAtlas> lineAtlas;
util::ptr<TexturePool> texturePool;
const std::unique_ptr<Painter> painter;