shithub: freetype+ttf2subf

Download patch

ref: 67ff7664e4cce992764e70cde25381d07377afee
parent: 683e3ad93632d040e4cc10b71323b3ddfee351a3
author: Werner Lemberg <[email protected]>
date: Thu Mar 23 08:41:30 EDT 2017 

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.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-23  Werner Lemberg  <[email protected]>
+
+	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  <[email protected]>
 
 	[truetype] Some variable renamings.
--- 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 );
     }