From f06456a82d5751d637a7e2cea21e4c71d2c8d2db Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 7 Oct 2017 10:35:11 +0200 Subject: [PATCH] [type1] Minor code shuffling. * src/type1/t1load.c (T1_Set_MM_Blend): Make it a wrapper of... (t1_set_mm_blend): ...this new function. (T1_Set_MM_Design): Use `t1_set_mm_blend'. --- ChangeLog | 8 ++++++++ src/type1/t1load.c | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f131f2f8b..1ed0a4cd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-10-07 Werner Lemberg + + [type1] Minor code shuffling. + + * src/type1/t1load.c (T1_Set_MM_Blend): Make it a wrapper of... + (t1_set_mm_blend): ...this new function. + (T1_Set_MM_Design): Use `t1_set_mm_blend'. + 2017-10-05 Werner Lemberg * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Fix integer diff --git a/src/type1/t1load.c b/src/type1/t1load.c index f569d6bec..54c8b6078 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -366,8 +366,8 @@ } - FT_LOCAL_DEF( FT_Error ) - T1_Set_MM_Blend( T1_Face face, + static FT_Error + t1_set_mm_blend( T1_Face face, FT_UInt num_coords, FT_Fixed* coords ) { @@ -412,6 +412,15 @@ } + FT_LOCAL_DEF( FT_Error ) + T1_Set_MM_Blend( T1_Face face, + FT_UInt num_coords, + FT_Fixed* coords ) + { + return t1_set_mm_blend( face, num_coords, coords ); + } + + FT_LOCAL_DEF( FT_Error ) T1_Get_MM_Blend( T1_Face face, FT_UInt num_coords, @@ -518,7 +527,7 @@ final_blends[n] = the_blend; } - return T1_Set_MM_Blend( face, blend->num_axis, final_blends ); + return t1_set_mm_blend( face, blend->num_axis, final_blends ); }