fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2026-05-09 06:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[base] s/FT_Driver_ClassRec/FT_Driver_Class/.

Browse source 
This is done for consistency with FT_Module_Class and FT_Renderer_Class.
All of these classes are constant and used similarly. The 'Rec' suffix
suggests that these classes are modifiable, when they are not.  The old
alias is deprecated.

* include/freetype/internal/ftdrv.h: Do it.
* builds/*, include/*, src/*: Update all users.
This commit is contained in:
Alexei Podtelezhnikov 2025-08-31 17:53:19 -04:00
parent d25553220e
commit 1b6845d9b8
32 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
builds/amiga/include/config/ftmodule.h
View file

@ -84,35 +84,35 @@ FT_USE_MODULE( FT_Module_Class, autofit_module_class )
#endif
#ifdef FT_USE_TT
FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
FT_USE_MODULE( FT_Driver_Class, tt_driver_class )
#endif
#ifdef FT_USE_T1
FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
FT_USE_MODULE( FT_Driver_Class, t1_driver_class )
#endif
#ifdef FT_USE_CFF
FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
FT_USE_MODULE( FT_Driver_Class, cff_driver_class )
#endif
#ifdef FT_USE_T1CID
FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
FT_USE_MODULE( FT_Driver_Class, t1cid_driver_class )
#endif
#ifdef FT_USE_PFR
FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
FT_USE_MODULE( FT_Driver_Class, pfr_driver_class )
#endif
#ifdef FT_USE_T42
FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
FT_USE_MODULE( FT_Driver_Class, t42_driver_class )
#endif
#ifdef FT_USE_WINFNT
FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
FT_USE_MODULE( FT_Driver_Class, winfnt_driver_class )
#endif
#ifdef FT_USE_PCF
FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
FT_USE_MODULE( FT_Driver_Class, pcf_driver_class )
#endif
#ifdef FT_USE_PSAUX
@ -144,7 +144,7 @@ FT_USE_MODULE( FT_Module_Class, otv_module_class )
#endif
#ifdef FT_USE_BDF
FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
FT_USE_MODULE( FT_Driver_Class, bdf_driver_class )
#endif
#ifdef FT_USE_GXV

2
builds/meson/parse_modules_cfg.py
View file

@ -75,7 +75,7 @@ def generate_ftmodule(lists):
"winfonts": "winfnt",
}.get(driver, driver)
result += (
"FT_USE_MODULE( FT_Driver_ClassRec, %s_driver_class )\n" % name
"FT_USE_MODULE( FT_Driver_Class, %s_driver_class )\n" % name
)
for module in lists["HINTING_MODULES"]:

18
include/freetype/config/ftmodule.h
View file

@ -11,15 +11,15 @@
*/
FT_USE_MODULE( FT_Module_Class, autofit_module_class )
FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
FT_USE_MODULE( FT_Driver_Class, tt_driver_class )
FT_USE_MODULE( FT_Driver_Class, t1_driver_class )
FT_USE_MODULE( FT_Driver_Class, cff_driver_class )
FT_USE_MODULE( FT_Driver_Class, t1cid_driver_class )
FT_USE_MODULE( FT_Driver_Class, pfr_driver_class )
FT_USE_MODULE( FT_Driver_Class, t42_driver_class )
FT_USE_MODULE( FT_Driver_Class, winfnt_driver_class )
FT_USE_MODULE( FT_Driver_Class, pcf_driver_class )
FT_USE_MODULE( FT_Driver_Class, bdf_driver_class )
FT_USE_MODULE( FT_Module_Class, psaux_module_class )
FT_USE_MODULE( FT_Module_Class, psnames_module_class )
FT_USE_MODULE( FT_Module_Class, pshinter_module_class )

14
include/freetype/internal/ftdrv.h
View file

@ -90,7 +90,7 @@ FT_BEGIN_HEADER
/**************************************************************************
*
* @struct:
* FT_Driver_ClassRec
* FT_Driver_Class
*
* @description:
* The font driver class. This structure mostly contains pointers to
@ -162,7 +162,7 @@ FT_BEGIN_HEADER
* Most function pointers, with the exception of `load_glyph`, can be set
* to 0 to indicate a default behaviour.
*/
typedef const struct FT_Driver_ClassRec_
typedef const struct FT_Driver_Class_
{
FT_Module_Class root;
@ -189,7 +189,7 @@ FT_BEGIN_HEADER
FT_Size_RequestFunc request_size;
FT_Size_SelectFunc select_size;
} FT_Driver_ClassRec, *FT_Driver_Class;
} FT_Driver_Class, FT_Driver_ClassRec;
/**************************************************************************
@ -198,14 +198,14 @@ FT_BEGIN_HEADER
* FT_DECLARE_DRIVER
*
* @description:
* Used to create a forward declaration of an FT_Driver_ClassRec struct
* Used to create a forward declaration of an FT_Driver_Class struct
* instance.
*
* @macro:
* FT_DEFINE_DRIVER
*
* @description:
* Used to initialize an instance of FT_Driver_ClassRec struct.
* Used to initialize an instance of FT_Driver_Class struct.
*
* `ftinit.c` (ft_create_default_module_classes) already contains a
* mechanism to call these functions for the default modules described in
@ -216,7 +216,7 @@ FT_BEGIN_HEADER
*/
#define FT_DECLARE_DRIVER( class_ ) \
FT_CALLBACK_TABLE \
FT_Driver_ClassRec class_;
FT_Driver_Class class_;
#define FT_DEFINE_DRIVER( \
class_, \
@ -245,7 +245,7 @@ FT_BEGIN_HEADER
request_size_, \
select_size_ ) \
FT_CALLBACK_TABLE_DEF \
FT_Driver_ClassRec class_ = \
FT_Driver_Class class_ = \
{ \
FT_DEFINE_ROOT_MODULE( flags_, \
size_, \

8
include/freetype/internal/ftobjs.h
View file

@ -815,10 +815,10 @@ FT_BEGIN_HEADER
*/
typedef struct FT_DriverRec_
{
FT_ModuleRec root;
FT_Driver_Class clazz;
FT_ListRec faces_list;
FT_GlyphLoader glyph_loader;
FT_ModuleRec root;
FT_Driver_Class* clazz;
FT_ListRec faces_list;
FT_GlyphLoader glyph_loader;
} FT_DriverRec;

52
src/base/ftobjs.c
View file

@ -311,7 +311,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 = NULL;
@ -624,9 +624,9 @@
static void
ft_glyphslot_done( FT_GlyphSlot slot )
{
FT_Driver driver = slot->face->driver;
FT_Driver_Class clazz = driver->clazz;
FT_Memory memory = driver->root.memory;
FT_Driver driver = slot->face->driver;
FT_Driver_Class* clazz = driver->clazz;
FT_Memory memory = driver->root.memory;
#ifdef FT_CONFIG_OPTION_SVG
if ( slot->face->face_flags & FT_FACE_FLAG_SVG )
@ -674,11 +674,11 @@
FT_New_GlyphSlot( FT_Face face,
FT_GlyphSlot *aslot )
{
FT_Error error;
FT_Driver driver;
FT_Driver_Class clazz;
FT_Memory memory;
FT_GlyphSlot slot = NULL;
FT_Error error;
FT_Driver driver;
FT_Driver_Class* clazz;
FT_Memory memory;
FT_GlyphSlot slot = NULL;
if ( !face )
@ -1299,9 +1299,9 @@
void* face_,
void* driver_ )
{
FT_Face face = (FT_Face)face_;
FT_Driver driver = (FT_Driver)driver_;
FT_Driver_Class clazz = driver->clazz;
FT_Face face = (FT_Face)face_;
FT_Driver driver = (FT_Driver)driver_;
FT_Driver_Class* clazz = driver->clazz;
/* discard auto-hinting data */
@ -1495,7 +1495,7 @@
FT_Face *aface )
{
FT_Memory memory;
FT_Driver_Class clazz;
FT_Driver_Class* clazz;
FT_Face face = NULL;
FT_Face_Internal internal = NULL;
@ -2870,7 +2870,7 @@
FT_Error error;
FT_Driver driver;
FT_Driver_Class clazz;
FT_Driver_Class* clazz;
/* test for valid `parameters' delayed to `FT_Stream_New' */
@ -2965,13 +2965,13 @@
FT_New_Size( FT_Face face,
FT_Size *asize )
{
FT_Error error;
FT_Memory memory;
FT_Driver driver;
FT_Driver_Class clazz;
FT_Error error;
FT_Memory memory;
FT_Driver driver;
FT_Driver_Class* clazz;
FT_Size size = NULL;
FT_ListNode node = NULL;
FT_Size size = NULL;
FT_ListNode node = NULL;
FT_Size_Internal internal = NULL;
@ -3373,8 +3373,8 @@
FT_Select_Size( FT_Face face,
FT_Int strike_index )
{
FT_Error error = FT_Err_Ok;
FT_Driver_Class clazz;
FT_Error error = FT_Err_Ok;
FT_Driver_Class* clazz;
if ( !face || !FT_HAS_FIXED_SIZES( face ) )
@ -3431,9 +3431,9 @@
FT_Request_Size( FT_Face face,
FT_Size_Request req )
{
FT_Error error;
FT_Driver_Class clazz;
FT_ULong strike_index;
FT_Error error;
FT_Driver_Class* clazz;
FT_ULong strike_index;
if ( !face )
@ -5135,7 +5135,7 @@
FT_Driver driver = FT_DRIVER( module );
driver->clazz = (FT_Driver_Class)module->clazz;
driver->clazz = (FT_Driver_Class*)module->clazz;
}
if ( clazz->module_init )

2
src/bdf/bdfdrivr.c
View file

@ -985,7 +985,7 @@ THE SOFTWARE.
FT_CALLBACK_TABLE_DEF
FT_Driver_ClassRec bdf_driver_class =
FT_Driver_Class bdf_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/bdf/bdfdrivr.h
View file

@ -60,7 +60,7 @@ FT_BEGIN_HEADER
} BDF_FaceRec, *BDF_Face;
FT_EXPORT_VAR( FT_Driver_ClassRec ) bdf_driver_class;
FT_EXPORT_VAR( FT_Driver_Class ) bdf_driver_class;
FT_END_HEADER

2
src/bdf/module.mk
View file

@ -27,7 +27,7 @@
FTMODULE_H_COMMANDS += BDF_DRIVER
define BDF_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, bdf_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, bdf_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)bdf $(ECHO_DRIVER_DESC)bdf bitmap fonts$(ECHO_DRIVER_DONE)
endef

2
src/cff/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += CFF_DRIVER
define CFF_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, cff_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, cff_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)cff $(ECHO_DRIVER_DESC)OpenType fonts with extension *.otf$(ECHO_DRIVER_DONE)
endef

2
src/cid/cidriver.c
View file

@ -230,7 +230,7 @@
FT_CALLBACK_TABLE_DEF
FT_Driver_ClassRec t1cid_driver_class =
FT_Driver_Class t1cid_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/cid/cidriver.h
View file

@ -26,7 +26,7 @@
FT_BEGIN_HEADER
FT_CALLBACK_TABLE
FT_Driver_ClassRec t1cid_driver_class;
FT_Driver_Class t1cid_driver_class;
FT_END_HEADER

2
src/cid/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TYPE1CID_DRIVER
define TYPE1CID_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, t1cid_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, t1cid_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)cid $(ECHO_DRIVER_DESC)Postscript CID-keyed fonts, no known extension$(ECHO_DRIVER_DONE)
endef

2
src/pcf/module.mk
View file

@ -27,7 +27,7 @@
FTMODULE_H_COMMANDS += PCF_DRIVER
define PCF_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, pcf_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, pcf_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)pcf $(ECHO_DRIVER_DESC)pcf bitmap fonts$(ECHO_DRIVER_DONE)
endef

2
src/pcf/pcfdrivr.c
View file

@ -793,7 +793,7 @@ THE SOFTWARE.
FT_CALLBACK_TABLE_DEF
FT_Driver_ClassRec pcf_driver_class =
FT_Driver_Class pcf_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/pcf/pcfdrivr.h
View file

@ -33,7 +33,7 @@ THE SOFTWARE.
FT_BEGIN_HEADER
FT_EXPORT_VAR( FT_Driver_ClassRec ) pcf_driver_class;
FT_EXPORT_VAR( FT_Driver_Class ) pcf_driver_class;
FT_END_HEADER

2
src/pfr/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += PFR_DRIVER
define PFR_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, pfr_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, pfr_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)pfr $(ECHO_DRIVER_DESC)PFR/TrueDoc font files with extension *.pfr$(ECHO_DRIVER_DONE)
endef

2
src/pfr/pfrdrivr.c
View file

@ -168,7 +168,7 @@
FT_CALLBACK_TABLE_DEF
FT_Driver_ClassRec pfr_driver_class =
FT_Driver_Class pfr_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/pfr/pfrdrivr.h
View file

@ -25,7 +25,7 @@
FT_BEGIN_HEADER
FT_EXPORT_VAR( FT_Driver_ClassRec ) pfr_driver_class;
FT_EXPORT_VAR( FT_Driver_Class ) pfr_driver_class;
FT_END_HEADER

2
src/truetype/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TRUETYPE_DRIVER
define TRUETYPE_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, tt_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, tt_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)truetype $(ECHO_DRIVER_DESC)Windows/Mac font files with extension *.ttf or *.ttc$(ECHO_DRIVER_DONE)
endef

2
src/truetype/ttobjs.h
View file

@ -252,7 +252,7 @@ FT_BEGIN_HEADER
/* Note: All of the functions below (except tt_size_reset()) are used */
/* as function pointers in a FT_Driver_ClassRec. Therefore their */
/* as function pointers in a FT_Driver_Class. Therefore their */
/* parameters are of types FT_Face, FT_Size, etc., rather than TT_Face, */
/* TT_Size, etc., so that the compiler can confirm that the types and */
/* number of parameters are correct. In all cases the FT_xxx types are */

2
src/type1/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TYPE1_DRIVER
define TYPE1_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, t1_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, t1_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)type1 $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
endef

2
src/type1/t1driver.c
View file

@ -757,7 +757,7 @@
FT_CALLBACK_TABLE_DEF
FT_Driver_ClassRec t1_driver_class =
FT_Driver_Class t1_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/type1/t1driver.h
View file

@ -25,7 +25,7 @@
FT_BEGIN_HEADER
FT_EXPORT_VAR( FT_Driver_ClassRec ) t1_driver_class;
FT_EXPORT_VAR( FT_Driver_Class ) t1_driver_class;
FT_END_HEADER

2
src/type42/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TYPE42_DRIVER
define TYPE42_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, t42_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, t42_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)type42 $(ECHO_DRIVER_DESC)Type 42 font files with no known extension$(ECHO_DRIVER_DONE)
endef

2
src/type42/t42drivr.c
View file

@ -199,7 +199,7 @@
}
FT_Driver_ClassRec t42_driver_class =
FT_Driver_Class t42_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/type42/t42drivr.h
View file

@ -25,7 +25,7 @@
FT_BEGIN_HEADER
FT_EXPORT_VAR( FT_Driver_ClassRec ) t42_driver_class;
FT_EXPORT_VAR( FT_Driver_Class ) t42_driver_class;
FT_END_HEADER

12
src/type42/t42objs.c
View file

@ -485,7 +485,7 @@
return FT_THROW( Missing_Module );
}
driver->ttclazz = (FT_Driver_Class)ttmodule->clazz;
driver->ttclazz = (FT_Driver_Class*)ttmodule->clazz;
return FT_Err_Ok;
}
@ -651,11 +651,11 @@
FT_UInt glyph_index,
FT_Int32 load_flags )
{
FT_Error error;
T42_GlyphSlot t42slot = (T42_GlyphSlot)glyph;
T42_Size t42size = (T42_Size)size;
T42_Face t42face = (T42_Face)size->face;
FT_Driver_Class ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
FT_Error error;
T42_GlyphSlot t42slot = (T42_GlyphSlot)glyph;
T42_Size t42size = (T42_Size)size;
T42_Face t42face = (T42_Face)size->face;
FT_Driver_Class* ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
FT_TRACE1(( "T42_GlyphSlot_Load: glyph index %u\n", glyph_index ));

4
src/type42/t42objs.h
View file

@ -53,8 +53,8 @@ FT_BEGIN_HEADER
/* Type 42 driver */
typedef struct T42_DriverRec_
{
FT_DriverRec root;
FT_Driver_Class ttclazz;
FT_DriverRec root;
FT_Driver_Class* ttclazz;
} T42_DriverRec, *T42_Driver;

2
src/winfonts/module.mk
View file

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += WINDOWS_DRIVER
define WINDOWS_DRIVER
$(OPEN_DRIVER) FT_Driver_ClassRec, winfnt_driver_class $(CLOSE_DRIVER)
$(OPEN_DRIVER) FT_Driver_Class, winfnt_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)winfnt $(ECHO_DRIVER_DESC)Windows bitmap fonts with extension *.fnt or *.fon$(ECHO_DRIVER_DONE)
endef

2
src/winfonts/winfnt.c
View file

@ -1176,7 +1176,7 @@
FT_CALLBACK_TABLE_DEF
FT_Driver_ClassRec winfnt_driver_class =
FT_Driver_Class winfnt_driver_class =
{
{
FT_MODULE_FONT_DRIVER |

2
src/winfonts/winfnt.h
View file

@ -152,7 +152,7 @@ FT_BEGIN_HEADER
} FNT_FaceRec, *FNT_Face;
FT_EXPORT_VAR( FT_Driver_ClassRec ) winfnt_driver_class;
FT_EXPORT_VAR( FT_Driver_Class ) winfnt_driver_class;
FT_END_HEADER