diff options
| author | Ben Wagner <bungeman@chromium.org> | 2023-04-06 11:16:29 -0400 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2023-04-11 10:20:58 +0200 |
| commit | e78e2d29a95baf6053e30cc9422aa20319259803 (patch) | |
| tree | e78efe8d5058413ff52ba636159e0692bcdd3985 /src/cff | |
| parent | e77d8ba87cf24c4bd07c5c4f23b17e5e4d4f433b (diff) | |
| download | freetype2-e78e2d29a95baf6053e30cc9422aa20319259803.tar.gz | |
[sfnt, truetype] Add `size_reset` to `MetricsVariations`.
This is a generalization of commit
```
commit e6699596af5c5d6f0ae0ea06e19df87dce088df8
Author: Werner Lemberg <wl@gnu.org>
Date: Thu Feb 2 11:38:04 2017 +0100
[truetype] Fix MVAR post-action handling.
```
It is also possible for plain `CFF ` style fonts to contain an `fvar` and
`MVAR` table and use `cff_metrics_adjust`. `tt_size_reset` should only be
called with `TT_Size` and never with `CFF_Size`.
Allow the "metrics-variations" service to specify the correct function (if
any) to reset `FT_Size`s after adjusting metrics.
* src/truetype/ttobjs.c (tt_size_reset): Split off some functionality
into...
(tt_size_reset_height): ... this new function.
* src/truetype/ttdriver.c (tt_service_metrics_variations): Add
`size_reset`.
(tt_size_select, tt_size_request): Updated.
* src/truetype/ttobjs.h: Updated.
* include/freetype/internal/services/svmetric.h (MetricsVariations): Add
`size_reset`.
(FT_DEFINE_SERVICE_METRICSVARIATIONSREC): Updated.
* include/freetype/internal/tttypes.h (TT_FaceRec_): Rename `var` to
`tt_var` and add `face_var`.
* src/cff/cffdrivr.c (cff_service_metrics_variations): Add `size_reset`.
(cff_hadvance_adjust, cff_metrics_adjust): Updated.
* src/cff/cffobjs.c (cff_face_init): Use `face_var`.
* src/sfnt/sfobjs.c (sfnt_init_face): Initialize `face_var`.
* src/sfnt/ttmtx.c (tt_face_get_metrics): Use `tt_var`.
* src/truetype/ttgxvar.c (tt_size_reset_iterator): Renamed to...
(ft_size_reset_iterator): ... this new function.
Call `size_reset`.
(tt_apply_mvar): Pass `size_reset` to `ft_size_reset_iterator`.
Fixes #1211
Diffstat (limited to 'src/cff')
| -rw-r--r-- | src/cff/cffdrivr.c | 9 | ||||
| -rw-r--r-- | src/cff/cffobjs.c | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 4e2e0e00d..688c4c0b3 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -1046,7 +1046,8 @@ FT_UInt gindex, FT_Int *avalue ) { - FT_Service_MetricsVariations var = (FT_Service_MetricsVariations)face->var; + FT_Service_MetricsVariations + var = (FT_Service_MetricsVariations)face->tt_var; return var->hadvance_adjust( FT_FACE( face ), gindex, avalue ); @@ -1056,7 +1057,8 @@ static void cff_metrics_adjust( CFF_Face face ) { - FT_Service_MetricsVariations var = (FT_Service_MetricsVariations)face->var; + FT_Service_MetricsVariations + var = (FT_Service_MetricsVariations)face->tt_var; var->metrics_adjust( FT_FACE( face ) ); @@ -1075,7 +1077,8 @@ (FT_BSB_Adjust_Func) NULL, /* bsb_adjust */ (FT_VOrg_Adjust_Func) NULL, /* vorg_adjust */ - (FT_Metrics_Adjust_Func) cff_metrics_adjust /* metrics_adjust */ + (FT_Metrics_Adjust_Func) cff_metrics_adjust, /* metrics_adjust */ + (FT_Size_Reset_Func) NULL /* size_reset */ ) #endif diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 3e94a283e..9608a4178 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -719,8 +719,10 @@ #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT { - FT_Service_MultiMasters mm = (FT_Service_MultiMasters)face->mm; - FT_Service_MetricsVariations var = (FT_Service_MetricsVariations)face->var; + FT_Service_MultiMasters + mm = (FT_Service_MultiMasters)face->mm; + FT_Service_MetricsVariations + var = (FT_Service_MetricsVariations)face->face_var; FT_UInt instance_index = (FT_UInt)face_index >> 16; |