diff options
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.cpp')
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index f677f7bb60..0f4cde56ad 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -42,25 +42,20 @@ SpriteAtlas::SpriteAtlas(Size size_, float pixelRatio_) SpriteAtlas::~SpriteAtlas() = default; -void SpriteAtlas::onSpriteLoaded(Images&& result) { +void SpriteAtlas::onSpriteLoaded() { markAsLoaded(); - - for (auto& pair : result) { - addImage(pair.first, pair.second->impl); - } - for (auto requestor : requestors) { requestor->onIconsAvailable(buildIconMap()); } requestors.clear(); } -void SpriteAtlas::addImage(const std::string& id, Immutable<style::Image::Impl> image_) { +void SpriteAtlas::addImage(Immutable<style::Image::Impl> image_) { icons.clear(); - auto it = entries.find(id); + auto it = entries.find(image_->id); if (it == entries.end()) { - entries.emplace(id, Entry { std::move(image_), {}, {} }); + entries.emplace(image_->id, Entry { image_, {}, {} }); return; } |