shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[base] Fix error handing in MM functions.

* src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates):
Implement it.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,13 @@

 2017-01-31  Werner Lemberg  <[email protected]>

+	[base] Fix error handing in MM functions.

+

+	* src/base/ftmm.c (FT_Set_Var_Design_Coordinates,

+	FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates):

+	Implement it.

+

+2017-01-31  Werner Lemberg  <[email protected]>

+

 	[truetype] Fix sanity check for `gvar' table (#50184).

 	* src/truetype/ttgxvar.c (ft_var_load_gvar): There might be missing

--- a/src/base/ftmm.c

+++ b/src/base/ftmm.c

@@ -205,8 +205,10 @@

         error = service_mm->set_var_design( face, num_coords, coords );

     }

-    error = ft_face_get_mvar_service( face, &service_mvar );

     if ( !error )

+      error = ft_face_get_mvar_service( face, &service_mvar );

+

+    if ( !error )

     {

       if ( service_mvar->metrics_adjust )

         service_mvar->metrics_adjust( face );

@@ -276,8 +278,10 @@

         error = service_mm->set_mm_blend( face, num_coords, coords );

     }

-    error = ft_face_get_mvar_service( face, &service_mvar );

     if ( !error )

+      error = ft_face_get_mvar_service( face, &service_mvar );

+

+    if ( !error )

     {

       if ( service_mvar->metrics_adjust )

         service_mvar->metrics_adjust( face );

@@ -322,7 +326,9 @@

         error = service_mm->set_mm_blend( face, num_coords, coords );

     }

-    error = ft_face_get_mvar_service( face, &service_mvar );

+    if ( !error )

+      error = ft_face_get_mvar_service( face, &service_mvar );

+

     if ( !error )

     {

       if ( service_mvar->metrics_adjust )