diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-11-06 16:26:34 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-11-06 16:26:45 +0100 |
| commit | ed942987caade4b8cf510b474fe6155b5726d648 (patch) | |
| tree | e52145152a84ea8aab8662850214a83a376efb8d /indra/llrender/llfontfreetype.cpp | |
| parent | 97300c608153d21a441ed34b0a5b9a2ea815df2e (diff) | |
| parent | 24bd7b2311e6fdd8bcf0a223d6dafaf4266ca4c7 (diff) | |
Merge branch contribution/emoji into contribution/emoji-ui
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 25740a5f87..d3a49339da 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -34,6 +34,7 @@ #ifdef LL_WINDOWS #include <freetype2\freetype\ftsystem.h> #endif +#include "llfontfreetypesvg.h" // For some reason, this won't work if it's not wrapped in the ifdef #ifdef FT_FREETYPE_H @@ -51,6 +52,8 @@ #include "llfontbitmapcache.h" #include "llgl.h" +#define ENABLE_OT_SVG_SUPPORT + FT_Render_Mode gFontRenderMode = FT_RENDER_MODE_NORMAL; LLFontManager *gFontManagerp = NULL; @@ -83,6 +86,16 @@ LLFontManager::LLFontManager() LL_ERRS() << "Freetype initialization failure!" << LL_ENDL; FT_Done_FreeType(gFTLibrary); } + +#ifdef ENABLE_OT_SVG_SUPPORT + SVG_RendererHooks hooks = { + LLFontFreeTypeSvgRenderer::OnInit, + LLFontFreeTypeSvgRenderer::OnFree, + LLFontFreeTypeSvgRenderer::OnRender, + LLFontFreeTypeSvgRenderer::OnPresetGlypthSlot, + }; + FT_Property_Set(gFTLibrary, "ot-svg", "svg-hooks", &hooks); +#endif } LLFontManager::~LLFontManager() |