diff options
author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-04-13 18:42:49 -0700 |
---|---|---|
committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-04-13 18:42:49 -0700 |
commit | e39482d5570719654e7206d74a2c7bee1aa96dae (patch) | |
tree | 0882fca33ce21b0f5db11a751c788618ed72d912 /src/mbgl/text/font.hpp | |
parent | fea3aa573ad49003068f94374d766300fc35247f (diff) | |
download | qtlocation-mapboxgl-e39482d5570719654e7206d74a2c7bee1aa96dae.tar.gz |
wire in some freetype nonsenseupstream/harfbuzz
Diffstat (limited to 'src/mbgl/text/font.hpp')
-rw-r--r-- | src/mbgl/text/font.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mbgl/text/font.hpp b/src/mbgl/text/font.hpp index 9d34b18df1..65e471ed18 100644 --- a/src/mbgl/text/font.hpp +++ b/src/mbgl/text/font.hpp @@ -7,6 +7,7 @@ #include <string> #include <harfbuzz/hb.h> +#include <harfbuzz/hb-ft.h> namespace mbgl { @@ -15,15 +16,17 @@ public: Font(const std::string &filename); ~Font(); - Shaping shape(const std::u32string &text, const float spacing, const vec2<float> &translate); + Shaping shape(const std::u32string &text, const float spacing, const vec2<float> &translate, const std::map<uint32_t, SDFGlyph> &sdfs); private: void load(); std::string filename_; + std::vector<FT_Face> ft_faces; hb_font_t *font_; hb_buffer_t *buffer_; unsigned int upem_; + double size = 0.0; }; } // end namespace mbgl |