summaryrefslogtreecommitdiff
path: root/src/map/sprite.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2014-11-20 17:13:35 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2014-11-21 14:25:11 -0800
commit9e971095d3561f7af5b0016614035a8b4e479b81 (patch)
treebe6a4d226e37ebe5db7dc2d132b27ecdefae37ff /src/map/sprite.cpp
parenta9b20fc09a51d62d471d8234387d07a838b4ca76 (diff)
downloadqtlocation-mapboxgl-9e971095d3561f7af5b0016614035a8b4e479b81.tar.gz
Pass FileSource by reference
Diffstat (limited to 'src/map/sprite.cpp')
-rw-r--r--src/map/sprite.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/sprite.cpp b/src/map/sprite.cpp
index ad1a8e770b..82073619d4 100644
--- a/src/map/sprite.cpp
+++ b/src/map/sprite.cpp
@@ -22,7 +22,7 @@ SpritePosition::SpritePosition(uint16_t x_, uint16_t y_, uint16_t width_, uint16
sdf(sdf_) {
}
-util::ptr<Sprite> Sprite::Create(const std::string& base_url, float pixelRatio, const util::ptr<FileSource> &fileSource) {
+util::ptr<Sprite> Sprite::Create(const std::string& base_url, float pixelRatio, FileSource& fileSource) {
util::ptr<Sprite> sprite(std::make_shared<Sprite>(Key(), base_url, pixelRatio));
sprite->load(fileSource);
return sprite;
@@ -51,7 +51,7 @@ Sprite::operator bool() const {
// Note: This is a separate function that must be called exactly once after creation
// The reason this isn't part of the constructor is that calling shared_from_this() in
// the constructor fails.
-void Sprite::load(const util::ptr<FileSource> &fileSource) {
+void Sprite::load(FileSource& fileSource) {
if (!valid) {
// Treat a non-existent sprite as a successfully loaded empty sprite.
loadedImage = true;
@@ -62,7 +62,7 @@ void Sprite::load(const util::ptr<FileSource> &fileSource) {
util::ptr<Sprite> sprite = shared_from_this();
- fileSource->request(ResourceType::JSON, jsonURL)->onload([sprite](const Response &res) {
+ fileSource.request(ResourceType::JSON, jsonURL)->onload([sprite](const Response &res) {
if (res.code == 200) {
sprite->body = res.data;
sprite->parseJSON();
@@ -75,7 +75,7 @@ void Sprite::load(const util::ptr<FileSource> &fileSource) {
}
});
- fileSource->request(ResourceType::Image, spriteURL)->onload([sprite](const Response &res) {
+ fileSource.request(ResourceType::Image, spriteURL)->onload([sprite](const Response &res) {
if (res.code == 200) {
sprite->image = res.data;
sprite->parseImage();