diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 12:42:17 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 16:29:44 -0700 |
commit | 1c42daa152c1e7302c0997c00e206cf7c4b33d73 (patch) | |
tree | edc0115651ed5e2931c8362016d2e7da5928f3ea /src/mbgl/sprite | |
parent | ea0e45b4019ea18c03718e67a3397202080a644a (diff) | |
download | qtlocation-mapboxgl-1c42daa152c1e7302c0997c00e206cf7c4b33d73.tar.gz |
[core] Tweak handling of annotation special case SpriteAtlas
* Simplify SymbolLayout; it never needs to care about more than one SpriteAtlas.
* Move the reference from SymbolLayer::Impl to SymbolBucket. This is a prerequisite for making layer Impls immutable.
Diffstat (limited to 'src/mbgl/sprite')
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 9d499411fe..fed8451aed 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -123,7 +123,7 @@ void SpriteAtlas::onParsed(Images&& result) { } observer->onSpriteLoaded(); for (auto requestor : requestors) { - requestor->onIconsAvailable(this, buildIconMap()); + requestor->onIconsAvailable(buildIconMap()); } requestors.clear(); } @@ -202,7 +202,7 @@ const style::Image* SpriteAtlas::getImage(const std::string& id) const { void SpriteAtlas::getIcons(IconRequestor& requestor) { if (isLoaded()) { - requestor.onIconsAvailable(this, buildIconMap()); + requestor.onIconsAvailable(buildIconMap()); } else { requestors.insert(&requestor); } diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 15bce919b1..5afddaebce 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -38,16 +38,12 @@ public: float height; }; -class SpriteAtlas; - -typedef std::map<std::string,SpriteAtlasElement> IconMap; +typedef std::map<std::string, SpriteAtlasElement> IconMap; typedef std::set<std::string> IconDependencies; -typedef std::map<uintptr_t,IconMap> IconAtlasMap; -typedef std::map<SpriteAtlas*,IconDependencies> IconDependencyMap; class IconRequestor { public: - virtual void onIconsAvailable(SpriteAtlas*, IconMap) = 0; + virtual void onIconsAvailable(IconMap) = 0; }; class SpriteAtlas : public util::noncopyable { |