commit 67ff7664e4cce992764e70cde25381d07377afee
author Werner Lemberg <wl@gnu.org> Thu Mar 23 12:41:30 2017 +0100
committer Werner Lemberg <wl@gnu.org> Thu Mar 23 12:41:30 2017 +0100
tree b4c8032cd058511942a2238e250316dbcf1611ef
parent 683e3ad93632d040e4cc10b71323b3ddfee351a3

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.

ChangeLog

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.

src/base/ftmm.c

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 );
     }