diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-11-20 20:12:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-11-21 09:58:50 +0100 |
| commit | e3245247421fc30c37a8b7321e2815e2507b5a1f (patch) | |
| tree | 132fb445a895acd3e4e966bae0bc5380b143f067 /vcl/unx | |
| parent | 8a93dbd60109a46b167bdc656bfb9a802ffe8f69 (diff) | |
clarify IsSymbolFont means Microsoft Symbol encoding
https: //freetype.org/freetype2/docs/reference/ft2-base_interface.html#ft_encoding_ms_symbol
https: //learn.microsoft.com/en-us/typography/opentype/spec/recom#non-standard-symbol-fonts
Change-Id: I77732fff67a145bd8fa347c3d0c8e4deb2083143
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143008
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index db2bd614336e..aca47bad7518 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -452,13 +452,10 @@ FreetypeFont::FreetypeFont(FreetypeFontInstance& rFontInstance, std::shared_ptr< * not need any glyph data from FreeType in this case */ /*FT_Error rc = */ FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight ); - FT_Select_Charmap(maFaceFT, FT_ENCODING_UNICODE); - - if( mxFontInfo->IsSymbolFont() ) - { - FT_Encoding eEncoding = FT_ENCODING_MS_SYMBOL; - FT_Select_Charmap(maFaceFT, eEncoding); - } + if (mxFontInfo->IsMicrosoftSymbolEncoded()) + FT_Select_Charmap(maFaceFT, FT_ENCODING_MS_SYMBOL); + else + FT_Select_Charmap(maFaceFT, FT_ENCODING_UNICODE); mbFaceOk = true; |