diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-03-19 11:16:24 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-03-19 11:16:24 +0200 |
| commit | fd7b0e19da95bf099c1769df8c72c719c2c379f2 (patch) | |
| tree | 09368f89380f4634172038cb5fcaed7bf88f7cad /indra/llrender/llfontfreetype.h | |
| parent | 9a2159a0393cae26d66f47fd48f4fa64f055c63e (diff) | |
SL-10610 FIXED Floaters fails to display certain symbols. Added ability to load font collections.
Diffstat (limited to 'indra/llrender/llfontfreetype.h')
| -rw-r--r-- | indra/llrender/llfontfreetype.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h index aadebf5e70..1afe84e770 100644 --- a/indra/llrender/llfontfreetype.h +++ b/indra/llrender/llfontfreetype.h @@ -84,7 +84,14 @@ public: // is_fallback should be true for fallback fonts that aren't used // to render directly (Unicode backup, primarily) - BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback); + BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback, S32 face_n = 0); + + S32 getNumFaces(const std::string& filename); + +#ifdef LL_WINDOWS + S32 ftOpenFace(const std::string& filename, S32 face_n); + void clearFontStreams(); +#endif typedef std::vector<LLPointer<LLFontFreetype> > font_vector_t; |