diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-12 12:32:42 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-15 08:20:18 -0700 |
| commit | 8fb1a81c46f4358d731712c16868aa1108d5d34c (patch) | |
| tree | f56e8f16e0c0824b0d9aab045bd234bfd7fcde45 /src/mbgl/sprite/sprite_atlas.hpp | |
| parent | b3ec985568176b077756b66754470988436d43c1 (diff) | |
| download | qtlocation-mapboxgl-8fb1a81c46f4358d731712c16868aa1108d5d34c.tar.gz | |
[core] Immutable<Impl> for Image
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.hpp')
| -rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 7ae583dcba..4e03c32b30 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -20,7 +20,7 @@ class Context; class SpriteAtlasElement { public: - SpriteAtlasElement(Rect<uint16_t>, const style::Image&, Size size, float pixelRatio); + SpriteAtlasElement(Rect<uint16_t>, const style::Image::Impl&, Size size, float pixelRatio); Rect<uint16_t> pos; bool sdf; @@ -60,8 +60,8 @@ public: void dumpDebugLogs() const; - const style::Image* getImage(const std::string&) const; - void addImage(const std::string&, std::unique_ptr<style::Image>); + const style::Image::Impl* getImage(const std::string&) const; + void addImage(const std::string&, Immutable<style::Image::Impl>); void removeImage(const std::string&); void getIcons(IconRequestor& requestor); @@ -91,7 +91,7 @@ private: bool loaded = false; struct Entry { - std::unique_ptr<const style::Image> image; + Immutable<style::Image::Impl> image; // One sprite image might be used as both an icon image and a pattern image. If so, // it must have two distinct entries in the texture. The one for the icon image has |