diff options
Diffstat (limited to 'src/mbgl/text')
-rw-r--r-- | src/mbgl/text/glyph_manager.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/text/glyph_pbf.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/text/glyph_pbf.hpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/mbgl/text/glyph_manager.cpp b/src/mbgl/text/glyph_manager.cpp index 3130418908..37574eff15 100644 --- a/src/mbgl/text/glyph_manager.cpp +++ b/src/mbgl/text/glyph_manager.cpp @@ -91,7 +91,7 @@ void GlyphManager::processResponse(const Response& res, const FontStack& fontSta std::vector<Glyph> glyphs; try { - glyphs = parseGlyphPBF(range, *res.data); + glyphs = parseGlyphPBF(range, res.data); } catch (...) { observer->onGlyphsError(fontStack, range, std::current_exception()); return; diff --git a/src/mbgl/text/glyph_pbf.cpp b/src/mbgl/text/glyph_pbf.cpp index cfaf803f75..77ea5ec2cb 100644 --- a/src/mbgl/text/glyph_pbf.cpp +++ b/src/mbgl/text/glyph_pbf.cpp @@ -4,11 +4,12 @@ namespace mbgl { -std::vector<Glyph> parseGlyphPBF(const GlyphRange& glyphRange, const std::string& data) { +std::vector<Glyph> parseGlyphPBF(const GlyphRange& glyphRange, Blob blob) { + const auto data = blob.uncompressedData(); std::vector<Glyph> result; result.reserve(256); - protozero::pbf_reader glyphs_pbf(data); + protozero::pbf_reader glyphs_pbf(*data); while (glyphs_pbf.next(1)) { auto fontstack_pbf = glyphs_pbf.get_message(); diff --git a/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp index 28a28b4114..0c82343ce5 100644 --- a/src/mbgl/text/glyph_pbf.hpp +++ b/src/mbgl/text/glyph_pbf.hpp @@ -8,6 +8,6 @@ namespace mbgl { -std::vector<Glyph> parseGlyphPBF(const GlyphRange&, const std::string& data); +std::vector<Glyph> parseGlyphPBF(const GlyphRange&, Blob blob); } // namespace mbgl |