[tfm] Modify `TFM_ServiceRec' and `TFM_FontInfoRec' definitions.
* include/freetype/internal/tfm.h(TFM_FontInfoRec): Change data types to accomodate changes. * include/freetype/internal/tfm.h(TFM_ServiceRec): Create `TFM_Parse_FuncsRec' to hold the `tfm' module functions.
This commit is contained in:
parent
2f59a4c8a9
commit
8d32347f78
|
@ -50,12 +50,12 @@ FT_BEGIN_HEADER
|
|||
/* Metrics */
|
||||
FT_ULong ds, fs; /* Design Size */
|
||||
FT_UInt design_size;
|
||||
FT_UInt slant;
|
||||
FT_ULong slant;
|
||||
FT_UInt begin_char, end_char;
|
||||
FT_Long *width, *height, *depth;
|
||||
/* Font bounding box */
|
||||
FT_UInt font_bbx_w, font_bbx_h;
|
||||
FT_UInt font_bbx_xoff, font_bbx_yoff;
|
||||
FT_Long font_bbx_w, font_bbx_h;
|
||||
FT_Long font_bbx_xoff, font_bbx_yoff;
|
||||
|
||||
} TFM_FontInfoRec, *TFM_FontInfo;
|
||||
|
||||
|
@ -71,6 +71,23 @@ FT_BEGIN_HEADER
|
|||
|
||||
typedef struct TFM_ParserRec_* TFM_Parser;
|
||||
|
||||
typedef struct TFM_Parser_FuncsRec_
|
||||
{
|
||||
FT_Error
|
||||
(*init)( TFM_Parser parser,
|
||||
FT_Memory memory,
|
||||
FT_Stream stream );
|
||||
|
||||
FT_Error
|
||||
(*parse_metrics)( TFM_Parser parser );
|
||||
|
||||
void
|
||||
(*done)( TFM_Parser parser );
|
||||
|
||||
} TFM_Parser_FuncsRec;
|
||||
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
* @struct:
|
||||
|
@ -112,16 +129,7 @@ FT_BEGIN_HEADER
|
|||
|
||||
typedef struct TFM_ServiceRec_
|
||||
{
|
||||
FT_Error
|
||||
(*init)( TFM_Parser parser,
|
||||
FT_Memory memory,
|
||||
FT_Stream stream );
|
||||
|
||||
FT_Error
|
||||
(*parse_metrics)( TFM_Parser parser );
|
||||
|
||||
void
|
||||
(*done)( TFM_Parser parser );
|
||||
const TFM_Parser_FuncsRec* tfm_parser_funcs;
|
||||
|
||||
} TFM_ServiceRec, *TFM_Service;
|
||||
|
||||
|
|
Loading…
Reference in New Issue