diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-02-23 14:15:10 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@gmail.com> | 2017-02-23 14:15:10 -0800 |
| commit | f66d98095e6ab682f06460e3aac0268ee6db341b (patch) | |
| tree | 6d5a6b1cce3f0676560227817f0b9b4b00420080 | |
| parent | e9f97d5876122a1fbeb822d957b8f12fe7edbd64 (diff) | |
| download | qtlocation-mapboxgl-f66d98095e6ab682f06460e3aac0268ee6db341b.tar.gz | |
Fix tests (by fixing pre-harfbuzz shaping)
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index d8aa913307..ed75d1d11e 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -224,7 +224,7 @@ void SymbolLayout::prepare(uintptr_t tileUID) { PositionedIcon shapedIcon; GlyphPositions face; - util::exclusive<GlyphSet> glyphSet = glyphAtlas.getLocalGlyphSet(*feature.localFontID); + util::exclusive<GlyphSet> glyphSet = feature.localFontID ? glyphAtlas.getLocalGlyphSet(*feature.localFontID) : glyphAtlas.getGlyphSet(layout.get<TextFont>()); // if feature has text, shape the text if (feature.text) { |