diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:24:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:24:34 +0000 |
| commit | 0457d78d77b11dc38731c1fe08a92b913a83a699 (patch) | |
| tree | 20675215494af58053a383e6cfcb82e597490dcd /src/truetype/ttgxvar.c | |
| parent | d66fb7a20c8aab42c8e262123777b8ea7e4e819a (diff) | |
| parent | 22e3a2d750d8a898426bbad01527fe749c9d1733 (diff) | |
| download | freetype-5083e9afefb472384886042a51f843021512b1cd.tar.gz | |
Snap for 11219529 from 22e3a2d750d8a898426bbad01527fe749c9d1733 to mainline-tzdata4-releaseaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_332714010
Change-Id: I27e3634c388683f2386307fa79f46b924213efde
Diffstat (limited to 'src/truetype/ttgxvar.c')
| -rw-r--r-- | src/truetype/ttgxvar.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 7f2db0cbd..bbd264048 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -1381,15 +1381,14 @@ static FT_Error - tt_size_reset_iterator( FT_ListNode node, + ft_size_reset_iterator( FT_ListNode node, void* user ) { - TT_Size size = (TT_Size)node->data; - - FT_UNUSED( user ); + FT_Size size = (FT_Size)node->data; + FT_Service_MetricsVariations var = (FT_Service_MetricsVariations)user; - tt_size_reset( size, 1 ); + var->size_reset( size ); return FT_Err_Ok; } @@ -1462,6 +1461,9 @@ /* adjust all derived values */ { + FT_Service_MetricsVariations var = + (FT_Service_MetricsVariations)face->face_var; + FT_Face root = &face->root; /* @@ -1503,11 +1505,12 @@ face->postscript.underlineThickness / 2; root->underline_thickness = face->postscript.underlineThickness; - /* iterate over all FT_Size objects and call `tt_size_reset' */ - /* to propagate the metrics changes */ - FT_List_Iterate( &root->sizes_list, - tt_size_reset_iterator, - NULL ); + /* iterate over all FT_Size objects and call `var->size_reset' */ + /* to propagate the metrics changes */ + if ( var && var->size_reset ) + FT_List_Iterate( &root->sizes_list, + ft_size_reset_iterator, + (void*)var ); } } |