diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-22 10:38:42 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-22 15:53:18 -0700 |
| commit | 5939dd5b412fcc1ef857711a137589aa865bd442 (patch) | |
| tree | 4bd4e021ea564ee262cff56ab7b6f76e98b29471 /src/mbgl/storage | |
| parent | d77e35b6866e461c3cb05de2112d548be4ef7780 (diff) | |
| download | qtlocation-mapboxgl-5939dd5b412fcc1ef857711a137589aa865bd442.tar.gz | |
[core] Use the proper type for font stacks
Diffstat (limited to 'src/mbgl/storage')
| -rw-r--r-- | src/mbgl/storage/resource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/storage/resource.cpp b/src/mbgl/storage/resource.cpp index d5b88d9292..d633ae195e 100644 --- a/src/mbgl/storage/resource.cpp +++ b/src/mbgl/storage/resource.cpp @@ -33,12 +33,12 @@ Resource Resource::spriteJSON(const std::string& base, float pixelRatio) { }; } -Resource Resource::glyphs(const std::string& urlTemplate, const std::string& fontStack, const std::pair<uint16_t, uint16_t>& glyphRange) { +Resource Resource::glyphs(const std::string& urlTemplate, const FontStack& fontStack, const std::pair<uint16_t, uint16_t>& glyphRange) { return Resource { Resource::Kind::Glyphs, util::replaceTokens(urlTemplate, [&](const std::string& token) { if (token == "fontstack") { - return util::percentEncode(fontStack); + return util::percentEncode(fontStackToString(fontStack)); } else if (token == "range") { return util::toString(glyphRange.first) + "-" + util::toString(glyphRange.second); } else { |