Commit 67ff7664e4cce992764e70cde25381d07377afee
2017-03-23T12:41:30
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/ChangeLog b/ChangeLog
index 9e07431..f344092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 6aaa5f8..2cb56a3 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -206,11 +206,10 @@
}
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 );
}
@@ -279,11 +278,10 @@
}
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 );
}
@@ -327,11 +325,10 @@
}
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 );
}