diff options
author | Chris Loer <chris.loer@gmail.com> | 2017-03-10 09:02:07 -0800 |
---|---|---|
committer | Chris Loer <chris.loer@gmail.com> | 2017-03-22 08:50:45 -0700 |
commit | e90966a9373d7aa7908b4a6fe39fa6cf5230cbc0 (patch) | |
tree | f75298824f64a157f6a6d69433bc653822c0a8e8 /src/mbgl/text/shaping.hpp | |
parent | 3c91b6b7de487993e75de552ba44249740644e42 (diff) | |
download | qtlocation-mapboxgl-e90966a9373d7aa7908b4a6fe39fa6cf5230cbc0.tar.gz |
[core] De-mutex GlyphAtlas.upstream/cloer_glyph_sanity_check
- Expose glyph information to workers via message interface.
- Symbol preparation for a tile now depends on all glyphs becoming
available before it can start.
Diffstat (limited to 'src/mbgl/text/shaping.hpp')
-rw-r--r-- | src/mbgl/text/shaping.hpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index 1b7b8b2733..fc404e3a97 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -9,6 +9,7 @@ namespace mbgl { class SpriteAtlasElement; class SymbolFeature; +class BiDi; class PositionedIcon { public: @@ -37,5 +38,18 @@ public: }; PositionedIcon shapeIcon(const SpriteAtlasElement&, const std::array<float, 2>& iconOffset, const float iconRotation); + +const Shaping getShaping(const std::u16string& string, + float maxWidth, + float lineHeight, + float horizontalAlign, + float verticalAlign, + float justify, + float spacing, + const Point<float>& translate, + float verticalHeight, + const WritingModeType, + BiDi& bidi, + const GlyphPositions& glyphs); } // namespace mbgl |