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/layout/symbol_layout.hpp | |
| parent | 940124ff713a960d7f70071779dd37d07010fa80 (diff) | |
| download | qtlocation-mapboxgl-dc1861f6d5391707126a20dbb0272f5bd3522de8.tar.gz | |
[core] Merge GlyphStore and GlyphAtlas
Diffstat (limited to 'src/mbgl/layout/symbol_layout.hpp')
| -rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 000dacaf3a..db27f1b817 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -16,7 +16,6 @@ class GeometryTileLayer; class CollisionTile; class SpriteAtlas; class GlyphAtlas; -class GlyphStore; class SymbolBucket; namespace style { @@ -38,11 +37,10 @@ public: float textMaxSize, SpriteAtlas&); - bool canPrepare(GlyphStore&); + bool canPrepare(GlyphAtlas&); void prepare(uintptr_t tileUID, - GlyphAtlas&, - GlyphStore&); + GlyphAtlas&); std::unique_ptr<SymbolBucket> place(CollisionTile&); |