summaryrefslogtreecommitdiff
path: root/include/mbgl/map/sprite.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-08-11 16:57:33 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-08-11 16:57:33 +0200
commit7a98ad4cf949dd1279719bf926bd08da0133210f (patch)
tree66ef1177038f1edefc08cc72a78cb49421b01e5c /include/mbgl/map/sprite.hpp
parente39ae931b9890bbe23013049df132243af454c49 (diff)
parent225b5e01cbadc46727f77ccf185c711b5f6956a7 (diff)
downloadqtlocation-mapboxgl-7a98ad4cf949dd1279719bf926bd08da0133210f.tar.gz
Merge pull request #407 from mapbox/filesource
Use style.json directory as base path for loading sprite images
Diffstat (limited to 'include/mbgl/map/sprite.hpp')
-rw-r--r--include/mbgl/map/sprite.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mbgl/map/sprite.hpp b/include/mbgl/map/sprite.hpp
index 969f15c161..967f1d6614 100644
--- a/include/mbgl/map/sprite.hpp
+++ b/include/mbgl/map/sprite.hpp
@@ -14,7 +14,7 @@
namespace mbgl {
-class Map;
+class FileSource;
class SpritePosition {
public:
@@ -33,11 +33,11 @@ public:
class Sprite : public std::enable_shared_from_this<Sprite>, private util::noncopyable {
private:
struct Key {};
- void load();
+ void load(const std::shared_ptr<FileSource> &fileSource);
public:
Sprite(const Key &, const std::string& base_url, float pixelRatio);
- static std::shared_ptr<Sprite> Create(const std::string& base_url, float pixelRatio);
+ static std::shared_ptr<Sprite> Create(const std::string& base_url, float pixelRatio, const std::shared_ptr<FileSource> &fileSource);
const SpritePosition &getSpritePosition(const std::string& name) const;