ref: ef3c12650edd2dfa462f661596f3f62843846c1c
parent: becd3c5cb2b44af3533e37fd4860162c24b30a99
author: David Turner <[email protected]>
date: Thu Mar 14 04:22:48 EST 2002
* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h,
src/base/ftapi.c, src/base/ftobjs.c,
src/cff/cffdrivr.c, src/cff/cffdrivr.h,
src/cid/cidriver.c, src/cid/cidriver.h,
src/pcf/pcfdriver.c, src/pcf/pcfdriver.h,
src/truetype/ttdriver.c, src/truetype/ttdriver.h,
src/type1/t1driver.c, src/type1/t1driver.h,
src/winfonts/winfnt.c, src/winfonts/winfnt.h:
updating the type definitions for font font drivers
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,8 +13,19 @@
(i.e. CFF_Font => CFF_FontRec
CFF_Font* => CFF_Font, etc...)
- * include/freetype/internal/fnttypes.h, src/winfnt/*.c: updating
+ * include/freetype/internal/fnttypes.h, src/winfonts/*.c: updating
the type definitions of the Windows FNT font driver
+
+ * include/freetype/internal/ftdriver.h,
+ include/freetype/internal/ftobjs.h,
+ src/base/ftapi.c, src/base/ftobjs.c,
+ src/cff/cffdrivr.c, src/cff/cffdrivr.h,
+ src/cid/cidriver.c, src/cid/cidriver.h,
+ src/pcf/pcfdriver.c, src/pcf/pcfdriver.h,
+ src/truetype/ttdriver.c, src/truetype/ttdriver.h,
+ src/type1/t1driver.c, src/type1/t1driver.h,
+ src/winfonts/winfnt.c, src/winfonts/winfnt.h:
+ updating the type definitions for font font drivers
2002-03-13 Antoine Leca <[email protected]>
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -28,81 +28,81 @@
typedef FT_Error
- (*FTDriver_initFace)( FT_Stream stream,
- FT_Face face,
- FT_Int typeface_index,
- FT_Int num_params,
- FT_Parameter* parameters );
+ (*FT_Face_InitFunc)( FT_Stream stream,
+ FT_Face face,
+ FT_Int typeface_index,
+ FT_Int num_params,
+ FT_Parameter* parameters );
typedef void
- (*FTDriver_doneFace)( FT_Face face );
+ (*FT_Face_DoneFunc)( FT_Face face );
typedef FT_Error
- (*FTDriver_initSize)( FT_Size size );
+ (*FT_Size_InitFunc)( FT_Size size );
typedef void
- (*FTDriver_doneSize)( FT_Size size );
+ (*FT_Size_DoneFunc)( FT_Size size );
typedef FT_Error
- (*FTDriver_initGlyphSlot)( FT_GlyphSlot slot );
+ (*FT_Slot_InitFunc)( FT_GlyphSlot slot );
typedef void
- (*FTDriver_doneGlyphSlot)( FT_GlyphSlot slot );
+ (*FT_Slot_DoneFunc)( FT_GlyphSlot slot );
typedef FT_Error
- (*FTDriver_setCharSizes)( FT_Size size,
- FT_F26Dot6 char_width,
- FT_F26Dot6 char_height,
- FT_UInt horz_resolution,
- FT_UInt vert_resolution );
+ (*FT_Size_ResetPointsFunc)( FT_Size size,
+ FT_F26Dot6 char_width,
+ FT_F26Dot6 char_height,
+ FT_UInt horz_resolution,
+ FT_UInt vert_resolution );
typedef FT_Error
- (*FTDriver_setPixelSizes)( FT_Size size,
- FT_UInt pixel_width,
- FT_UInt pixel_height );
+ (*FT_Size_ResetPixelsFunc)( FT_Size size,
+ FT_UInt pixel_width,
+ FT_UInt pixel_height );
typedef FT_Error
- (*FTDriver_loadGlyph)( FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_Int load_flags );
+ (*FT_Slot_LoadFunc)( FT_GlyphSlot slot,
+ FT_Size size,
+ FT_UInt glyph_index,
+ FT_Int load_flags );
typedef FT_UInt
- (*FTDriver_getCharIndex)( FT_CharMap charmap,
- FT_Long charcode );
+ (*FT_CharMap_CharIndexFunc)( FT_CharMap charmap,
+ FT_Long charcode );
typedef FT_Long
- (*FTDriver_getNextChar)( FT_CharMap charmap,
- FT_Long charcode );
+ (*FT_CharMap_CharNextFunc)( FT_CharMap charmap,
+ FT_Long charcode );
typedef FT_Error
- (*FTDriver_getKerning)( FT_Face face,
- FT_UInt left_glyph,
- FT_UInt right_glyph,
- FT_Vector* kerning );
+ (*FT_Face_GetKerningFunc)( FT_Face face,
+ FT_UInt left_glyph,
+ FT_UInt right_glyph,
+ FT_Vector* kerning );
typedef FT_Error
- (*FTDriver_attachFile)( FT_Face face,
- FT_Stream stream );
+ (*FT_Face_AttachFunc)( FT_Face face,
+ FT_Stream stream );
typedef FT_Error
- (*FTDriver_getAdvances)( FT_Face face,
- FT_UInt first,
- FT_UInt count,
- FT_Bool vertical,
- FT_UShort* advances );
+ (*FT_Face_GetAdvancesFunc)( FT_Face face,
+ FT_UInt first,
+ FT_UInt count,
+ FT_Bool vertical,
+ FT_UShort* advances );
/*************************************************************************/
/* */
/* <Struct> */
- /* FT_Driver_Class */
+ /* FT_Driver_ClassRec */
/* */
/* <Description> */
/* The font driver class. This structure mostly contains pointers to */
@@ -165,36 +165,35 @@
/* Most function pointers, with the exception of `load_glyph' and */
/* `get_char_index' can be set to 0 to indicate a default behaviour. */
/* */
- typedef struct FT_Driver_Class_
+ typedef struct FT_Driver_ClassRec_
{- FT_Module_Class root;
+ FT_Module_Class root;
- FT_Int face_object_size;
- FT_Int size_object_size;
- FT_Int slot_object_size;
+ FT_Int face_object_size;
+ FT_Int size_object_size;
+ FT_Int slot_object_size;
- FTDriver_initFace init_face;
- FTDriver_doneFace done_face;
+ FT_Face_InitFunc init_face;
+ FT_Face_DoneFunc done_face;
- FTDriver_initSize init_size;
- FTDriver_doneSize done_size;
+ FT_Size_InitFunc init_size;
+ FT_Size_DoneFunc done_size;
- FTDriver_initGlyphSlot init_slot;
- FTDriver_doneGlyphSlot done_slot;
+ FT_Slot_InitFunc init_slot;
+ FT_Slot_DoneFunc done_slot;
- FTDriver_setCharSizes set_char_sizes;
- FTDriver_setPixelSizes set_pixel_sizes;
+ FT_Size_ResetPointsFunc set_char_sizes;
+ FT_Size_ResetPixelsFunc set_pixel_sizes;
- FTDriver_loadGlyph load_glyph;
- FTDriver_getCharIndex get_char_index;
+ FT_Slot_LoadFunc load_glyph;
+ FT_CharMap_CharIndexFunc get_char_index;
- FTDriver_getKerning get_kerning;
- FTDriver_attachFile attach_file;
+ FT_Face_GetKerningFunc get_kerning;
+ FT_Face_AttachFunc attach_file;
+ FT_Face_GetAdvancesFunc get_advances;
+ FT_CharMap_CharNextFunc get_next_char;
- FTDriver_getAdvances get_advances;
-
- FTDriver_getNextChar get_next_char;
- } FT_Driver_Class;
+ } FT_Driver_ClassRec, *FT_Driver_Class;
FT_END_HEADER
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -580,7 +580,7 @@
typedef struct FT_DriverRec_
{FT_ModuleRec root;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_ListRec faces_list;
void* extensions;
--- a/src/base/ftapi.c
+++ b/src/base/ftapi.c
@@ -291,7 +291,7 @@
FT_Face face,
FT_Driver driver )
{- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
/* discard auto-hinting data */
@@ -364,7 +364,7 @@
FT_Face* aface )
{FT_Memory memory;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Face face = 0;
FT_Error error;
FT_Face_Internal internal;
@@ -671,7 +671,7 @@
FT_Error error;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
/* test for valid `parameters' delayed to ft_new_input_stream() */
@@ -748,7 +748,7 @@
FT_Error error;
FT_Memory memory;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size size = 0;
FT_ListNode node = 0;
@@ -880,7 +880,7 @@
{FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics;
FT_Long dim_x, dim_y;
@@ -949,7 +949,7 @@
{FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics = &face->size->metrics;
@@ -1757,7 +1757,7 @@
FT_Driver driver = FT_DRIVER( module );
- driver->clazz = (FT_Driver_Class*)module->clazz;
+ driver->clazz = (FT_Driver_Class)module->clazz;
if ( FT_DRIVER_USES_OUTLINES( driver ) )
{error = FT_GlyphLoader_New( memory, &driver->glyph_loader );
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -141,7 +141,7 @@
ft_glyphslot_init( FT_GlyphSlot slot )
{FT_Driver driver = slot->face->driver;
- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
FT_Memory memory = driver->root.memory;
FT_Error error = FT_Err_Ok;
FT_Slot_Internal internal;
@@ -201,7 +201,7 @@
ft_glyphslot_done( FT_GlyphSlot slot )
{FT_Driver driver = slot->face->driver;
- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
FT_Memory memory = driver->root.memory;
@@ -231,7 +231,7 @@
{FT_Error error;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Memory memory;
FT_GlyphSlot slot;
@@ -558,7 +558,7 @@
FT_Face face,
FT_Driver driver )
{- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
/* discard auto-hinting data */
@@ -632,7 +632,7 @@
FT_Face* aface )
{FT_Memory memory;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Face face = 0;
FT_Error error;
FT_Face_Internal internal;
@@ -939,7 +939,7 @@
FT_Error error;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
/* test for valid `parameters' delayed to ft_input_stream_new() */
@@ -1016,7 +1016,7 @@
FT_Error error;
FT_Memory memory;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size size = 0;
FT_ListNode node = 0;
@@ -1148,7 +1148,7 @@
{FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics;
FT_Long dim_x, dim_y;
@@ -1217,7 +1217,7 @@
{FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics = &face->size->metrics;
@@ -2116,7 +2116,7 @@
FT_Driver driver = FT_DRIVER( module );
- driver->clazz = (FT_Driver_Class*)module->clazz;
+ driver->clazz = (FT_Driver_Class)module->clazz;
if ( FT_DRIVER_USES_OUTLINES( driver ) )
{error = FT_GlyphLoader_New( memory, &driver->glyph_loader );
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -459,7 +459,7 @@
/* The FT_DriverInterface structure is defined in ftdriver.h. */
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class cff_driver_class =
+ const FT_Driver_ClassRec cff_driver_class =
{/* begin with the FT_Module_Class fields */
{@@ -484,24 +484,24 @@
sizeof( FT_SizeRec ),
sizeof( CFF_GlyphSlotRec ),
- (FTDriver_initFace) CFF_Face_Init,
- (FTDriver_doneFace) CFF_Face_Done,
- (FTDriver_initSize) CFF_Size_Init,
- (FTDriver_doneSize) CFF_Size_Done,
- (FTDriver_initGlyphSlot)CFF_GlyphSlot_Init,
- (FTDriver_doneGlyphSlot)CFF_GlyphSlot_Done,
+ (FT_Face_InitFunc) CFF_Face_Init,
+ (FT_Face_DoneFunc) CFF_Face_Done,
+ (FT_Size_InitFunc) CFF_Size_Init,
+ (FT_Size_DoneFunc) CFF_Size_Done,
+ (FT_Slot_InitFunc)CFF_GlyphSlot_Init,
+ (FT_Slot_DoneFunc)CFF_GlyphSlot_Done,
- (FTDriver_setCharSizes) CFF_Size_Reset,
- (FTDriver_setPixelSizes)CFF_Size_Reset,
+ (FT_Size_ResetPointsFunc) CFF_Size_Reset,
+ (FT_Size_ResetPixelsFunc)CFF_Size_Reset,
- (FTDriver_loadGlyph) Load_Glyph,
- (FTDriver_getCharIndex) cff_get_char_index,
+ (FT_Slot_LoadFunc) Load_Glyph,
+ (FT_CharMap_CharIndexFunc) cff_get_char_index,
- (FTDriver_getKerning) Get_Kerning,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) Get_Kerning,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) cff_get_next_char
+ (FT_CharMap_CharNextFunc) cff_get_next_char
};
@@ -527,7 +527,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{return &cff_driver_class;
--- a/src/cff/cffdrivr.h
+++ b/src/cff/cffdrivr.h
@@ -28,7 +28,7 @@
FT_CALLBACK_TABLE
- const FT_Driver_Class cff_driver_class;
+ const FT_Driver_ClassRec cff_driver_class;
FT_END_HEADER
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -289,7 +289,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class t1cid_driver_class =
+ const FT_Driver_ClassRec t1cid_driver_class =
{/* first of all, the FT_Module_Class fields */
{@@ -314,26 +314,26 @@
sizeof( CID_SizeRec ),
sizeof( CID_GlyphSlotRec ),
- (FTDriver_initFace) CID_Face_Init,
- (FTDriver_doneFace) CID_Face_Done,
+ (FT_Face_InitFunc) CID_Face_Init,
+ (FT_Face_DoneFunc) CID_Face_Done,
- (FTDriver_initSize) CID_Size_Init,
- (FTDriver_doneSize) CID_Size_Done,
- (FTDriver_initGlyphSlot)CID_GlyphSlot_Init,
- (FTDriver_doneGlyphSlot)CID_GlyphSlot_Done,
+ (FT_Size_InitFunc) CID_Size_Init,
+ (FT_Size_DoneFunc) CID_Size_Done,
+ (FT_Slot_InitFunc)CID_GlyphSlot_Init,
+ (FT_Slot_DoneFunc)CID_GlyphSlot_Done,
- (FTDriver_setCharSizes) CID_Size_Reset,
- (FTDriver_setPixelSizes)CID_Size_Reset,
+ (FT_Size_ResetPointsFunc) CID_Size_Reset,
+ (FT_Size_ResetPixelsFunc)CID_Size_Reset,
- (FTDriver_loadGlyph) CID_Load_Glyph,
- (FTDriver_getCharIndex) CID_Get_Char_Index,
+ (FT_Slot_LoadFunc) CID_Load_Glyph,
+ (FT_CharMap_CharIndexFunc) CID_Get_Char_Index,
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) CID_Get_Next_Char
+ (FT_CharMap_CharNextFunc) CID_Get_Next_Char
};
@@ -359,7 +359,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{return &t1cid_driver_class;
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -28,7 +28,7 @@
FT_CALLBACK_TABLE
- const FT_Driver_Class t1cid_driver_class;
+ const FT_Driver_ClassRec t1cid_driver_class;
FT_END_HEADER
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -325,7 +325,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class pcf_driver_class =
+ const FT_Driver_ClassRec pcf_driver_class =
{ {ft_module_font_driver,
@@ -346,24 +346,24 @@
sizeof( FT_SizeRec ),
sizeof( FT_GlyphSlotRec ),
- (FTDriver_initFace) PCF_Face_Init,
- (FTDriver_doneFace) PCF_Face_Done,
- (FTDriver_initSize) 0,
- (FTDriver_doneSize) 0,
- (FTDriver_initGlyphSlot)0,
- (FTDriver_doneGlyphSlot)0,
+ (FT_Face_InitFunc) PCF_Face_Init,
+ (FT_Face_DoneFunc) PCF_Face_Done,
+ (FT_Size_InitFunc) 0,
+ (FT_Size_DoneFunc) 0,
+ (FT_Slot_InitFunc)0,
+ (FT_Slot_DoneFunc)0,
- (FTDriver_setCharSizes) PCF_Set_Pixel_Size,
- (FTDriver_setPixelSizes)PCF_Set_Pixel_Size,
+ (FT_Size_ResetPointsFunc) PCF_Set_Pixel_Size,
+ (FT_Size_ResetPixelsFunc)PCF_Set_Pixel_Size,
- (FTDriver_loadGlyph) PCF_Glyph_Load,
- (FTDriver_getCharIndex) PCF_Char_Get_Index,
+ (FT_Slot_LoadFunc) PCF_Glyph_Load,
+ (FT_CharMap_CharIndexFunc) PCF_Char_Get_Index,
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) PCF_Char_Get_Next,
+ (FT_CharMap_CharNextFunc) PCF_Char_Get_Next,
};
@@ -389,7 +389,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{return &pcf_driver_class;
--- a/src/pcf/pcfdriver.h
+++ b/src/pcf/pcfdriver.h
@@ -33,7 +33,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) pcf_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class;
FT_END_HEADER
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -477,7 +477,7 @@
/* The FT_DriverInterface structure is defined in ftdriver.h. */
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class tt_driver_class =
+ const FT_Driver_ClassRec tt_driver_class =
{ {ft_module_font_driver |
@@ -506,23 +506,23 @@
sizeof ( FT_GlyphSlotRec ),
- (FTDriver_initFace) TT_Init_Face,
- (FTDriver_doneFace) TT_Done_Face,
- (FTDriver_initSize) TT_Init_Size,
- (FTDriver_doneSize) TT_Done_Size,
- (FTDriver_initGlyphSlot)0,
- (FTDriver_doneGlyphSlot)0,
+ (FT_Face_InitFunc) TT_Init_Face,
+ (FT_Face_DoneFunc) TT_Done_Face,
+ (FT_Size_InitFunc) TT_Init_Size,
+ (FT_Size_DoneFunc) TT_Done_Size,
+ (FT_Slot_InitFunc)0,
+ (FT_Slot_DoneFunc)0,
- (FTDriver_setCharSizes) Set_Char_Sizes,
- (FTDriver_setPixelSizes)Set_Pixel_Sizes,
- (FTDriver_loadGlyph) Load_Glyph,
- (FTDriver_getCharIndex) Get_Char_Index,
+ (FT_Size_ResetPointsFunc) Set_Char_Sizes,
+ (FT_Size_ResetPixelsFunc)Set_Pixel_Sizes,
+ (FT_Slot_LoadFunc) Load_Glyph,
+ (FT_CharMap_CharIndexFunc) Get_Char_Index,
- (FTDriver_getKerning) Get_Kerning,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) Get_Kerning,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) Get_Next_Char
+ (FT_CharMap_CharNextFunc) Get_Next_Char
};
@@ -548,7 +548,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{return &tt_driver_class;
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -27,7 +27,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) tt_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) tt_driver_class;
FT_END_HEADER
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -457,7 +457,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class t1_driver_class =
+ const FT_Driver_ClassRec t1_driver_class =
{ {ft_module_font_driver |
@@ -481,28 +481,28 @@
sizeof( T1_SizeRec ),
sizeof( T1_GlyphSlotRec ),
- (FTDriver_initFace) T1_Face_Init,
- (FTDriver_doneFace) T1_Face_Done,
- (FTDriver_initSize) T1_Size_Init,
- (FTDriver_doneSize) T1_Size_Done,
- (FTDriver_initGlyphSlot)T1_GlyphSlot_Init,
- (FTDriver_doneGlyphSlot)T1_GlyphSlot_Done,
+ (FT_Face_InitFunc) T1_Face_Init,
+ (FT_Face_DoneFunc) T1_Face_Done,
+ (FT_Size_InitFunc) T1_Size_Init,
+ (FT_Size_DoneFunc) T1_Size_Done,
+ (FT_Slot_InitFunc)T1_GlyphSlot_Init,
+ (FT_Slot_DoneFunc)T1_GlyphSlot_Done,
- (FTDriver_setCharSizes) T1_Size_Reset,
- (FTDriver_setPixelSizes)T1_Size_Reset,
- (FTDriver_loadGlyph) T1_Load_Glyph,
- (FTDriver_getCharIndex) Get_Char_Index,
+ (FT_Size_ResetPointsFunc) T1_Size_Reset,
+ (FT_Size_ResetPixelsFunc)T1_Size_Reset,
+ (FT_Slot_LoadFunc) T1_Load_Glyph,
+ (FT_CharMap_CharIndexFunc) Get_Char_Index,
#ifdef T1_CONFIG_OPTION_NO_AFM
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
#else
- (FTDriver_getKerning) Get_Kerning,
- (FTDriver_attachFile) T1_Read_AFM,
+ (FT_Face_GetKerningFunc) Get_Kerning,
+ (FT_Face_AttachFunc) T1_Read_AFM,
#endif
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) Get_Next_Char
+ (FT_CharMap_CharNextFunc) Get_Next_Char
};
@@ -528,7 +528,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{return &t1_driver_class;
--- a/src/type1/t1driver.h
+++ b/src/type1/t1driver.h
@@ -27,7 +27,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) t1_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) t1_driver_class;
FT_END_HEADER
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -711,7 +711,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class winfnt_driver_class =
+ const FT_Driver_ClassRec winfnt_driver_class =
{ {ft_module_font_driver,
@@ -732,24 +732,24 @@
sizeof( FNT_SizeRec ),
sizeof( FT_GlyphSlotRec ),
- (FTDriver_initFace) FNT_Face_Init,
- (FTDriver_doneFace) FNT_Face_Done,
- (FTDriver_initSize) 0,
- (FTDriver_doneSize) 0,
- (FTDriver_initGlyphSlot)0,
- (FTDriver_doneGlyphSlot)0,
+ (FT_Face_InitFunc) FNT_Face_Init,
+ (FT_Face_DoneFunc) FNT_Face_Done,
+ (FT_Size_InitFunc) 0,
+ (FT_Size_DoneFunc) 0,
+ (FT_Slot_InitFunc)0,
+ (FT_Slot_DoneFunc)0,
- (FTDriver_setCharSizes) FNT_Size_Set_Pixels,
- (FTDriver_setPixelSizes)FNT_Size_Set_Pixels,
+ (FT_Size_ResetPointsFunc) FNT_Size_Set_Pixels,
+ (FT_Size_ResetPixelsFunc)FNT_Size_Set_Pixels,
- (FTDriver_loadGlyph) FNT_Load_Glyph,
- (FTDriver_getCharIndex) FNT_Get_Char_Index,
+ (FT_Slot_LoadFunc) FNT_Load_Glyph,
+ (FT_CharMap_CharIndexFunc) FNT_Get_Char_Index,
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) FNT_Get_Next_Char
+ (FT_CharMap_CharNextFunc) FNT_Get_Next_Char
};
@@ -775,7 +775,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{return &winfnt_driver_class;
--- a/src/winfonts/winfnt.h
+++ b/src/winfonts/winfnt.h
@@ -27,7 +27,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) winfnt_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) winfnt_driver_class;
FT_END_HEADER