diff options
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 7 | ||||
-rw-r--r-- | src/mbgl/renderer/symbol_bucket.hpp | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 1071fdcce9..1f2ad96bf2 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -1,8 +1,8 @@ #include <mbgl/renderer/symbol_bucket.hpp> #include <mbgl/layer/symbol_layer.hpp> #include <mbgl/map/geometry_tile.hpp> -#include <mbgl/sprite/sprite.hpp> #include <mbgl/sprite/sprite_image.hpp> +#include <mbgl/sprite/sprite_store.hpp> #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/geometry/text_buffer.hpp> #include <mbgl/geometry/icon_buffer.hpp> @@ -158,13 +158,12 @@ void SymbolBucket::parseFeatures(const GeometryTileLayer& layer, } } -bool SymbolBucket::needsDependencies(GlyphStore& glyphStore, - Sprite& sprite) { +bool SymbolBucket::needsDependencies(GlyphStore& glyphStore, SpriteStore& spriteStore) { if (!layout.text.field.value.empty() && !layout.text.font.value.empty() && !glyphStore.hasGlyphRanges(layout.text.font, ranges)) { return true; } - if (!layout.icon.image.value.empty() && !sprite.isLoaded()) { + if (!layout.icon.image.value.empty() && !spriteStore.isLoaded()) { return true; } diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index 3c6f5f6d25..ff4bbf5dca 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -28,7 +28,7 @@ class CollisionBoxShader; class DotShader; class CollisionTile; class SpriteAtlas; -class Sprite; +class SpriteStore; class GlyphAtlas; class GlyphStore; @@ -88,8 +88,7 @@ public: void parseFeatures(const GeometryTileLayer&, const FilterExpression&); - bool needsDependencies(GlyphStore& glyphStore, - Sprite& sprite); + bool needsDependencies(GlyphStore&, SpriteStore&); void placeFeatures(CollisionTile&) override; private: |