diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-15 17:03:13 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-19 09:40:43 -0700 |
| commit | dc1861f6d5391707126a20dbb0272f5bd3522de8 (patch) | |
| tree | 961a3612706b9466d9ff0ef278ae1206b821aa88 /src/mbgl/style/style.hpp | |
| parent | 940124ff713a960d7f70071779dd37d07010fa80 (diff) | |
| download | qtlocation-mapboxgl-dc1861f6d5391707126a20dbb0272f5bd3522de8.tar.gz | |
[core] Merge GlyphStore and GlyphAtlas
Diffstat (limited to 'src/mbgl/style/style.hpp')
| -rw-r--r-- | src/mbgl/style/style.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 2621e53c45..a3c51a45e7 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -5,7 +5,7 @@ #include <mbgl/style/source_observer.hpp> #include <mbgl/style/layer_observer.hpp> #include <mbgl/style/update_batch.hpp> -#include <mbgl/text/glyph_store_observer.hpp> +#include <mbgl/text/glyph_atlas_observer.hpp> #include <mbgl/sprite/sprite_atlas_observer.hpp> #include <mbgl/map/mode.hpp> #include <mbgl/map/zoom_history.hpp> @@ -24,7 +24,6 @@ namespace mbgl { class FileSource; -class GlyphStore; class GlyphAtlas; class SpriteAtlas; class LineAtlas; @@ -36,7 +35,7 @@ class Layer; class UpdateParameters; class QueryParameters; -class Style : public GlyphStoreObserver, +class Style : public GlyphAtlasObserver, public SpriteAtlasObserver, public SourceObserver, public LayerObserver, @@ -103,7 +102,6 @@ public: void dumpDebugLogs() const; FileSource& fileSource; - std::unique_ptr<GlyphStore> glyphStore; std::unique_ptr<GlyphAtlas> glyphAtlas; std::unique_ptr<SpriteAtlas> spriteAtlas; std::unique_ptr<LineAtlas> lineAtlas; |