diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-04-27 23:06:51 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2023-04-28 13:45:49 +0200 |
| commit | 36e9878cc271a7f43d562152b9d602ed2cfdce18 (patch) | |
| tree | 43d7992d59522149c2f3c62aa1f32b4230276390 /src/sfnt/sfobjs.c | |
| parent | d7551af0986d2098f23899301f152039bd428ad6 (diff) | |
| download | freetype2-36e9878cc271a7f43d562152b9d602ed2cfdce18.tar.gz | |
[truetype] Fix style name handling for variation fonts.dev/wl/VF-infodev/wl/VF-fixes
* include/freetype/internal/tttypes.h (TT_FaceRec): New field
`non_var_style_name`.
* src/sfnt/sfobjs.c (sfnt_load_face): Initialize `non_var_style_name`.
(sfnt_done_face): Free `non_var_style_name`.
* src/truetype/ttgxvar.c (TT_Set_Named_Instance): Restore non-VF style name
if switching back to non-VF mode.
Diffstat (limited to 'src/sfnt/sfobjs.c')
| -rw-r--r-- | src/sfnt/sfobjs.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 1574c353d..f5d66ef84 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -1063,6 +1063,16 @@ GET_NAME( FONT_SUBFAMILY, &face->root.style_name ); } +#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT + { + FT_Memory memory = face->root.memory; + + + if ( FT_STRDUP( face->non_var_style_name, face->root.style_name ) ) + goto Exit; + } +#endif + /* now set up root fields */ { FT_Face root = &face->root; @@ -1509,6 +1519,7 @@ #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT FT_FREE( face->var_postscript_prefix ); + FT_FREE( face->non_var_style_name ); #endif /* freeing glyph color palette data */ |