diff options
| author | Ewald Hew <ewaldhew@gmail.com> | 2017-06-03 17:39:31 +0800 |
|---|---|---|
| committer | Ewald Hew <ewaldhew@gmail.com> | 2017-06-05 15:13:27 +0800 |
| commit | 697c216aa172cccc9fa02e243249d1fcb28c9b3d (patch) | |
| tree | ad96d2dc1e73de604963038e48183c26d3b598f4 | |
| parent | d3f25a041872f55358c78e1df0dadae37cee42d9 (diff) | |
| download | freetype2-697c216aa172cccc9fa02e243249d1fcb28c9b3d.tar.gz | |
Move definition of CFF_Builder_Funcs
| -rw-r--r-- | include/freetype/internal/psaux.h | 101 |
1 files changed, 51 insertions, 50 deletions
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h index 7118bf359..f015c88dd 100644 --- a/include/freetype/internal/psaux.h +++ b/include/freetype/internal/psaux.h @@ -712,57 +712,8 @@ FT_BEGIN_HEADER /*************************************************************************/ -#if 1 - //TODO(ewaldhew): use these in cf2_interp - typedef FT_Error - (*CFF_Builder_Check_Points_Func)( CFF_Builder* builder, - FT_Int count ); - - typedef void - (*CFF_Builder_Add_Point_Func)( CFF_Builder* builder, - FT_Pos x, - FT_Pos y, - FT_Byte flag ); - typedef FT_Error - (*CFF_Builder_Add_Point1_Func)( CFF_Builder* builder, - FT_Pos x, - FT_Pos y ); - typedef FT_Error - (*CFF_Builder_Start_Point_Func)( CFF_Builder* builder, - FT_Pos x, - FT_Pos y ); - typedef void - (*CFF_Builder_Close_Contour_Func)( CFF_Builder* builder ); - - /* static */ - typedef FT_Error - (*CFF_Builder_Add_Contour_Func)( CFF_Builder* builder ); + typedef struct CFF_Builder_FuncsRec_ CFF_Builder_FuncsRec; - typedef const struct CFF_Builder_FuncsRec_* CFF_Builder_Funcs; - - typedef struct CFF_Builder_FuncsRec_ - { - /* static */ - void - (*init)( CFF_Builder* builder, - TT_Face face, - CFF_Size size, - CFF_GlyphSlot glyph, - FT_Bool hinting ); - - /* static */ - void - (*done)( CFF_Builder* builder ); - - CFF_Builder_Check_Points_Func check_points; - CFF_Builder_Add_Point_Func add_point; - CFF_Builder_Add_Point1_Func add_point1; - CFF_Builder_Start_Point_Func start_point; - CFF_Builder_Close_Contour_Func close_contour; - CFF_Builder_Add_Contour_Func add_contour; - - } CFF_Builder_FuncsRec; -#endif /*************************************************************************/ /* */ @@ -839,6 +790,56 @@ FT_BEGIN_HEADER } CFF_Builder; + typedef FT_Error + (*CFF_Builder_Check_Points_Func)( CFF_Builder* builder, + FT_Int count ); + + typedef void + (*CFF_Builder_Add_Point_Func)( CFF_Builder* builder, + FT_Pos x, + FT_Pos y, + FT_Byte flag ); + typedef FT_Error + (*CFF_Builder_Add_Point1_Func)( CFF_Builder* builder, + FT_Pos x, + FT_Pos y ); + typedef FT_Error + (*CFF_Builder_Start_Point_Func)( CFF_Builder* builder, + FT_Pos x, + FT_Pos y ); + typedef void + (*CFF_Builder_Close_Contour_Func)( CFF_Builder* builder ); + + /* static */ + typedef FT_Error + (*CFF_Builder_Add_Contour_Func)( CFF_Builder* builder ); + + typedef const struct CFF_Builder_FuncsRec_* CFF_Builder_Funcs; + + struct CFF_Builder_FuncsRec_ + { + /* static */ + void + (*init)( CFF_Builder* builder, + TT_Face face, + CFF_Size size, + CFF_GlyphSlot glyph, + FT_Bool hinting ); + + /* static */ + void + (*done)( CFF_Builder* builder ); + + CFF_Builder_Check_Points_Func check_points; + CFF_Builder_Add_Point_Func add_point; + CFF_Builder_Add_Point1_Func add_point1; + CFF_Builder_Start_Point_Func start_point; + CFF_Builder_Close_Contour_Func close_contour; + CFF_Builder_Add_Contour_Func add_contour; + + }; + + /*************************************************************************/ /*************************************************************************/ /***** *****/ |