ReFuel/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make MM fonts work (again).

Browse Source 
* src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore
return value of `ft_face_get_mvar_service'; instead, check whether a
service is actually returned.
This commit is contained in:
Werner Lemberg 2017-03-23 12:41:30 +01:00
parent 683e3ad936
commit 67ff7664e4
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2017-03-23 Werner Lemberg <wl@gnu.org>
Make MM fonts work (again).
* src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore
return value of `ft_face_get_mvar_service'; instead, check whether a
service is actually returned.
2017-03-20 Werner Lemberg <wl@gnu.org>
[truetype] Some variable renamings.

21
src/base/ftmm.c
View File

@ -205,12 +205,11 @@
error = service_mm->set_var_design( face, num_coords, coords );
}
if ( !error )
error = ft_face_get_mvar_service( face, &service_mvar );
if ( !error )
{
if ( service_mvar->metrics_adjust )
(void)ft_face_get_mvar_service( face, &service_mvar );
if ( service_mvar && service_mvar->metrics_adjust )
service_mvar->metrics_adjust( face );
}
@ -278,12 +277,11 @@
error = service_mm->set_mm_blend( face, num_coords, coords );
}
if ( !error )
error = ft_face_get_mvar_service( face, &service_mvar );
if ( !error )
{
if ( service_mvar->metrics_adjust )
(void)ft_face_get_mvar_service( face, &service_mvar );
if ( service_mvar && service_mvar->metrics_adjust )
service_mvar->metrics_adjust( face );
}
@ -326,12 +324,11 @@
error = service_mm->set_mm_blend( face, num_coords, coords );
}
if ( !error )
error = ft_face_get_mvar_service( face, &service_mvar );
if ( !error )
{
if ( service_mvar->metrics_adjust )
(void)ft_face_get_mvar_service( face, &service_mvar );
if ( service_mvar && service_mvar->metrics_adjust )
service_mvar->metrics_adjust( face );
}