diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-15 14:09:06 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-16 12:26:35 -0700 |
commit | cc1ea759a681cadcfd06fd7bdda79ca6deb38c62 (patch) | |
tree | 97ece422b0516b11979c84b8136f95aeabb1aa91 /src/mbgl/sprite/sprite_atlas.hpp | |
parent | c0f6e5ccefc67dbdaa6ab7c7ea75a2a2d0c3f2ae (diff) | |
download | qtlocation-mapboxgl-cc1ea759a681cadcfd06fd7bdda79ca6deb38c62.tar.gz |
[core, node, darwin, android, qt] Make image ID part of Image
More like Source and Layer.
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.hpp')
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 4e03c32b30..bcec26b7ba 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -43,12 +43,10 @@ public: class SpriteAtlas : public util::noncopyable { public: - using Images = std::unordered_map<std::string, std::unique_ptr<style::Image>>; - SpriteAtlas(Size, float pixelRatio); ~SpriteAtlas(); - void onSpriteLoaded(Images&&); + void onSpriteLoaded(); void markAsLoaded() { loaded = true; @@ -61,7 +59,7 @@ public: void dumpDebugLogs() const; const style::Image::Impl* getImage(const std::string&) const; - void addImage(const std::string&, Immutable<style::Image::Impl>); + void addImage(Immutable<style::Image::Impl>); void removeImage(const std::string&); void getIcons(IconRequestor& requestor); |