Commit 910c597d1a6f1409ab427b91f096b1ef5484d203
2000-06-22T00:31:01
updated for new design
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/src/macfond/fonddrvr.c b/src/macfond/fonddrvr.c
index ea308d3..8066d0d 100644
--- a/src/macfond/fonddrvr.c
+++ b/src/macfond/fonddrvr.c
@@ -504,52 +504,45 @@ error:
}
- static
- void done_face( FOND_Face face )
- {
- /*
- We'll *only* get here if init_face() doesn't succeed,
- since if it *does* succeed, it has set the face->driver
- to either the TrueType driver or the Type 1 driver.
- And since we promise not leave any garbage if init_face()
- fails, there's nothing left to do.
- */
- }
-
/* The FT_DriverInterface structure is defined in ftdriver.h. */
- const FT_DriverInterface fond_driver_interface =
+ const FT_Driver_Class fond_driver_class =
{
- sizeof ( FT_DriverRec ),
+ {
+ ft_module_font_driver | ft_module_driver_scalable,
+ sizeof ( FT_DriverRec ),
+
+ "fond", /* driver name */
+ 100, /* driver version == 1.0 */
+ 200, /* driver requires FreeType 2.0 or above */
+
+ (void*)0,
+
+ (FT_Module_Constructor) init_driver,
+ (FT_Module_Destructor) done_driver,
+ (FT_Module_Requester) 0
+ },
+
sizeof ( FOND_FaceRec ),
0,
0,
- "fond", /* driver name */
- 100, /* driver version == 1.0 */
- 200, /* driver requires FreeType 2.0 or above */
-
- (void*)0,
-
- (FTDriver_initDriver) init_driver,
- (FTDriver_doneDriver) done_driver,
- (FTDriver_getInterface) 0,
-
(FTDriver_initFace) init_face,
- (FTDriver_doneFace) done_face,
- (FTDriver_getKerning) 0,
-
+ (FTDriver_doneFace) 0,
(FTDriver_initSize) 0,
(FTDriver_doneSize) 0,
- (FTDriver_setCharSizes) 0,
- (FTDriver_setPixelSizes) 0,
-
(FTDriver_initGlyphSlot) 0,
(FTDriver_doneGlyphSlot) 0,
- (FTDriver_loadGlyph) 0,
+ (FTDriver_setCharSizes) 0,
+ (FTDriver_setPixelSizes) 0,
+ (FTDriver_loadGlyph) 0,
(FTDriver_getCharIndex) 0,
+
+ (FTDriver_getKerning) 0,
+ (FTDriver_attachFile) 0,
+ (FTDriver_getAdvances) 0
};
@@ -575,9 +568,9 @@ error:
/* */
#ifdef FT_CONFIG_OPTION_DYNAMIC_DRIVERS
- FT_EXPORT_FUNC(FT_DriverInterface*) getDriverInterface( void )
+ FT_EXPORT_FUNC(const FT_Driver_Class*) getDriverClass( void )
{
- return &fond_driver_interface;
+ return &fond_driver_class;
}
#endif /* CONFIG_OPTION_DYNAMIC_DRIVERS */