[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 5179c89: Comments.
|
From: |
Werner LEMBERG |
|
Subject: |
[freetype2] master 5179c89: Comments. |
|
Date: |
Mon, 19 Oct 2015 06:50:17 +0000 |
branch: master
commit 5179c89f61aa6b6de00aa01c2e8b7fb6cf3021d0
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Comments.
---
src/bdf/bdfdrivr.c | 32 ++++++++++++++++----------------
src/cff/cffdrivr.c | 32 +++++++++++++++-----------------
src/cid/cidriver.c | 38 +++++++++++++++++---------------------
src/pcf/pcfdrivr.c | 32 ++++++++++++++++----------------
src/pfr/pfrdrivr.c | 33 +++++++++++++++++----------------
src/truetype/ttdriver.c | 32 ++++++++++++++++----------------
src/type1/t1driver.c | 37 +++++++++++++++++++------------------
src/type42/t42drivr.c | 32 ++++++++++++++++----------------
src/winfonts/winfnt.c | 32 ++++++++++++++++----------------
9 files changed, 148 insertions(+), 152 deletions(-)
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 404af51..915299b 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -866,32 +866,32 @@ THE SOFTWARE.
0x10000L,
0x20000L,
- 0,
+ 0, /* module-specific interface */
- 0, /* FT_Module_Constructor */
- 0, /* FT_Module_Destructor */
- bdf_driver_requester
+ 0, /* FT_Module_Constructor module_init */
+ 0, /* FT_Module_Destructor module_done */
+ bdf_driver_requester /* FT_Module_Requester get_interface */
},
sizeof ( BDF_FaceRec ),
sizeof ( FT_SizeRec ),
sizeof ( FT_GlyphSlotRec ),
- BDF_Face_Init,
- BDF_Face_Done,
- 0, /* FT_Size_InitFunc */
- 0, /* FT_Size_DoneFunc */
- 0, /* FT_Slot_InitFunc */
- 0, /* FT_Slot_DoneFunc */
+ BDF_Face_Init, /* FT_Face_InitFunc init_face */
+ BDF_Face_Done, /* FT_Face_DoneFunc done_face */
+ 0, /* FT_Size_InitFunc init_size */
+ 0, /* FT_Size_DoneFunc done_size */
+ 0, /* FT_Slot_InitFunc init_slot */
+ 0, /* FT_Slot_DoneFunc done_slot */
- BDF_Glyph_Load,
+ BDF_Glyph_Load, /* FT_Slot_LoadFunc load_glyph */
- 0, /* FT_Face_GetKerningFunc */
- 0, /* FT_Face_AttachFunc */
- 0, /* FT_Face_GetAdvancesFunc */
+ 0, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ 0, /* FT_Face_GetAdvancesFunc get_advances */
- BDF_Size_Request,
- BDF_Size_Select
+ BDF_Size_Request, /* FT_Size_RequestFunc request_size */
+ BDF_Size_Select /* FT_Size_SelectFunc select_size */
};
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 6221c0c..4028ab2 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -876,31 +876,29 @@
0, /* module-specific interface */
- cff_driver_init,
- cff_driver_done,
- cff_get_interface,
+ cff_driver_init, /* FT_Module_Constructor module_init */
+ cff_driver_done, /* FT_Module_Destructor module_done */
+ cff_get_interface, /* FT_Module_Requester get_interface */
- /* now the specific driver fields */
sizeof ( TT_FaceRec ),
sizeof ( CFF_SizeRec ),
sizeof ( CFF_GlyphSlotRec ),
- cff_face_init,
- cff_face_done,
- cff_size_init,
- cff_size_done,
- cff_slot_init,
- cff_slot_done,
+ cff_face_init, /* FT_Face_InitFunc init_face */
+ cff_face_done, /* FT_Face_DoneFunc done_face */
+ cff_size_init, /* FT_Size_InitFunc init_size */
+ cff_size_done, /* FT_Size_DoneFunc done_size */
+ cff_slot_init, /* FT_Slot_InitFunc init_slot */
+ cff_slot_done, /* FT_Slot_DoneFunc done_slot */
- cff_glyph_load,
+ cff_glyph_load, /* FT_Slot_LoadFunc load_glyph */
- cff_get_kerning,
- 0, /* FT_Face_AttachFunc */
- cff_get_advances,
+ cff_get_kerning, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ cff_get_advances, /* FT_Face_GetAdvancesFunc get_advances */
- cff_size_request,
-
- CFF_SIZE_SELECT
+ cff_size_request, /* FT_Size_RequestFunc request_size */
+ CFF_SIZE_SELECT /* FT_Size_SelectFunc select_size */
)
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 07c4cc4..aca1f25 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -190,46 +190,42 @@
FT_CALLBACK_TABLE_DEF
const FT_Driver_ClassRec t1cid_driver_class =
{
- /* first of all, the FT_Module_Class fields */
{
FT_MODULE_FONT_DRIVER |
FT_MODULE_DRIVER_SCALABLE |
FT_MODULE_DRIVER_HAS_HINTER,
-
sizeof ( FT_DriverRec ),
+
"t1cid", /* module name */
0x10000L, /* version 1.0 of driver */
0x20000L, /* requires FreeType 2.0 */
- 0,
+ 0, /* module-specific interface */
- cid_driver_init,
- cid_driver_done,
- cid_get_interface
+ cid_driver_init, /* FT_Module_Constructor module_init */
+ cid_driver_done, /* FT_Module_Destructor module_done */
+ cid_get_interface /* FT_Module_Requester get_interface */
},
- /* then the other font drivers fields */
sizeof ( CID_FaceRec ),
sizeof ( CID_SizeRec ),
sizeof ( CID_GlyphSlotRec ),
- cid_face_init,
- cid_face_done,
-
- cid_size_init,
- cid_size_done,
- cid_slot_init,
- cid_slot_done,
-
- cid_slot_load_glyph,
+ cid_face_init, /* FT_Face_InitFunc init_face */
+ cid_face_done, /* FT_Face_DoneFunc done_face */
+ cid_size_init, /* FT_Size_InitFunc init_size */
+ cid_size_done, /* FT_Size_DoneFunc done_size */
+ cid_slot_init, /* FT_Slot_InitFunc init_slot */
+ cid_slot_done, /* FT_Slot_DoneFunc done_slot */
- 0, /* FT_Face_GetKerningFunc */
- 0, /* FT_Face_AttachFunc */
+ cid_slot_load_glyph, /* FT_Slot_LoadFunc load_glyph */
- 0, /* FT_Face_GetAdvancesFunc */
+ 0, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ 0, /* FT_Face_GetAdvancesFunc get_advances */
- cid_size_request,
- 0 /* FT_Size_SelectFunc */
+ cid_size_request, /* FT_Size_RequestFunc request_size */
+ 0 /* FT_Size_SelectFunc select_size */
};
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index 0f4c518..1c2725f 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -700,32 +700,32 @@ THE SOFTWARE.
0x10000L,
0x20000L,
- 0,
+ 0, /* module-specific interface */
- 0, /* FT_Module_Constructor */
- 0, /* FT_Module_Destructor */
- pcf_driver_requester
+ 0, /* FT_Module_Constructor module_init */
+ 0, /* FT_Module_Destructor module_done */
+ pcf_driver_requester /* FT_Module_Requester get_interface */
},
sizeof ( PCF_FaceRec ),
sizeof ( FT_SizeRec ),
sizeof ( FT_GlyphSlotRec ),
- PCF_Face_Init,
- PCF_Face_Done,
- 0, /* FT_Size_InitFunc */
- 0, /* FT_Size_DoneFunc */
- 0, /* FT_Slot_InitFunc */
- 0, /* FT_Slot_DoneFunc */
+ PCF_Face_Init, /* FT_Face_InitFunc init_face */
+ PCF_Face_Done, /* FT_Face_DoneFunc done_face */
+ 0, /* FT_Size_InitFunc init_size */
+ 0, /* FT_Size_DoneFunc done_size */
+ 0, /* FT_Slot_InitFunc init_slot */
+ 0, /* FT_Slot_DoneFunc done_slot */
- PCF_Glyph_Load,
+ PCF_Glyph_Load, /* FT_Slot_LoadFunc load_glyph */
- 0, /* FT_Face_GetKerningFunc */
- 0, /* FT_Face_AttachFunc */
- 0, /* FT_Face_GetAdvancesFunc */
+ 0, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ 0, /* FT_Face_GetAdvancesFunc get_advances */
- PCF_Size_Request,
- PCF_Size_Select
+ PCF_Size_Request, /* FT_Size_RequestFunc request_size */
+ PCF_Size_Select /* FT_Size_SelectFunc select_size */
};
diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c
index 8753748..adbcac5 100644
--- a/src/pfr/pfrdrivr.c
+++ b/src/pfr/pfrdrivr.c
@@ -181,31 +181,32 @@
0x10000L,
0x20000L,
- NULL,
+ 0, /* module-specific interface */
- 0, /* FT_Module_Constructor */
- 0, /* FT_Module_Destructor */
- pfr_get_service
+ 0, /* FT_Module_Constructor module_init */
+ 0, /* FT_Module_Destructor module_done */
+ pfr_get_service /* FT_Module_Requester get_interface */
},
sizeof ( PFR_FaceRec ),
sizeof ( PFR_SizeRec ),
sizeof ( PFR_SlotRec ),
- pfr_face_init,
- pfr_face_done,
- 0, /* FT_Size_InitFunc */
- 0, /* FT_Size_DoneFunc */
- pfr_slot_init,
- pfr_slot_done,
+ pfr_face_init, /* FT_Face_InitFunc init_face */
+ pfr_face_done, /* FT_Face_DoneFunc done_face */
+ 0, /* FT_Size_InitFunc init_size */
+ 0, /* FT_Size_DoneFunc done_size */
+ pfr_slot_init, /* FT_Slot_InitFunc init_slot */
+ pfr_slot_done, /* FT_Slot_DoneFunc done_slot */
- pfr_slot_load,
+ pfr_slot_load, /* FT_Slot_LoadFunc load_glyph */
- pfr_get_kerning,
- 0, /* FT_Face_AttachFunc */
- 0, /* FT_Face_GetAdvancesFunc */
- 0, /* FT_Size_RequestFunc */
- 0, /* FT_Size_SelectFunc */
+ pfr_get_kerning, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ 0, /* FT_Face_GetAdvancesFunc get_advances */
+
+ 0, /* FT_Size_RequestFunc request_size */
+ 0, /* FT_Size_SelectFunc select_size */
};
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 08b30c9..8b88b7e 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -534,31 +534,31 @@
0x10000L, /* driver version == 1.0 */
0x20000L, /* driver requires FreeType 2.0 or above */
- (void*)0, /* driver specific interface */
+ 0, /* module-specific interface */
- tt_driver_init,
- tt_driver_done,
- tt_get_interface,
+ tt_driver_init, /* FT_Module_Constructor module_init */
+ tt_driver_done, /* FT_Module_Destructor module_done */
+ tt_get_interface, /* FT_Module_Requester get_interface */
sizeof ( TT_FaceRec ),
sizeof ( TT_SizeRec ),
sizeof ( FT_GlyphSlotRec ),
- tt_face_init,
- tt_face_done,
- tt_size_init,
- tt_size_done,
- tt_slot_init,
- 0, /* FT_Slot_DoneFunc */
+ tt_face_init, /* FT_Face_InitFunc init_face */
+ tt_face_done, /* FT_Face_DoneFunc done_face */
+ tt_size_init, /* FT_Size_InitFunc init_size */
+ tt_size_done, /* FT_Size_DoneFunc done_size */
+ tt_slot_init, /* FT_Slot_InitFunc init_slot */
+ 0, /* FT_Slot_DoneFunc done_slot */
- tt_glyph_load,
+ tt_glyph_load, /* FT_Slot_LoadFunc load_glyph */
- tt_get_kerning,
- 0, /* FT_Face_AttachFunc */
- tt_get_advances,
+ tt_get_kerning, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ tt_get_advances, /* FT_Face_GetAdvancesFunc get_advances */
- tt_size_request,
- TT_SIZE_SELECT
+ tt_size_request, /* FT_Size_RequestFunc request_size */
+ TT_SIZE_SELECT /* FT_Size_SelectFunc select_size */
)
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 571f2d2..c0ca1e8 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -689,36 +689,37 @@
0x10000L,
0x20000L,
- 0, /* format interface */
+ 0, /* module-specific interface */
- T1_Driver_Init,
- T1_Driver_Done,
- Get_Interface,
+ T1_Driver_Init, /* FT_Module_Constructor module_init */
+ T1_Driver_Done, /* FT_Module_Destructor module_done */
+ Get_Interface, /* FT_Module_Requester get_interface */
},
sizeof ( T1_FaceRec ),
sizeof ( T1_SizeRec ),
sizeof ( T1_GlyphSlotRec ),
- T1_Face_Init,
- T1_Face_Done,
- T1_Size_Init,
- T1_Size_Done,
- T1_GlyphSlot_Init,
- T1_GlyphSlot_Done,
+ T1_Face_Init, /* FT_Face_InitFunc init_face */
+ T1_Face_Done, /* FT_Face_DoneFunc done_face */
+ T1_Size_Init, /* FT_Size_InitFunc init_size */
+ T1_Size_Done, /* FT_Size_DoneFunc done_size */
+ T1_GlyphSlot_Init, /* FT_Slot_InitFunc init_slot */
+ T1_GlyphSlot_Done, /* FT_Slot_DoneFunc done_slot */
- T1_Load_Glyph,
+ T1_Load_Glyph, /* FT_Slot_LoadFunc load_glyph */
#ifdef T1_CONFIG_OPTION_NO_AFM
- 0, /* FT_Face_GetKerningFunc */
- 0, /* FT_Face_AttachFunc */
+ 0, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
#else
- Get_Kerning,
- T1_Read_Metrics,
+ Get_Kerning, /* FT_Face_GetKerningFunc get_kerning */
+ T1_Read_Metrics, /* FT_Face_AttachFunc attach_file */
#endif
- T1_Get_Advances,
- T1_Size_Request,
- 0 /* FT_Size_SelectFunc */
+ T1_Get_Advances, /* FT_Face_GetAdvancesFunc get_advances */
+
+ T1_Size_Request, /* FT_Size_RequestFunc request_size */
+ 0 /* FT_Size_SelectFunc select_size */
};
diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c
index 2907096..da7d8e5 100644
--- a/src/type42/t42drivr.c
+++ b/src/type42/t42drivr.c
@@ -212,32 +212,32 @@
0x10000L,
0x20000L,
- 0, /* format interface */
+ 0, /* module-specific interface */
- T42_Driver_Init,
- T42_Driver_Done,
- T42_Get_Interface,
+ T42_Driver_Init, /* FT_Module_Constructor module_init */
+ T42_Driver_Done, /* FT_Module_Destructor module_done */
+ T42_Get_Interface, /* FT_Module_Requester get_interface */
},
sizeof ( T42_FaceRec ),
sizeof ( T42_SizeRec ),
sizeof ( T42_GlyphSlotRec ),
- T42_Face_Init,
- T42_Face_Done,
- T42_Size_Init,
- T42_Size_Done,
- T42_GlyphSlot_Init,
- T42_GlyphSlot_Done,
+ T42_Face_Init, /* FT_Face_InitFunc init_face */
+ T42_Face_Done, /* FT_Face_DoneFunc done_face */
+ T42_Size_Init, /* FT_Size_InitFunc init_size */
+ T42_Size_Done, /* FT_Size_DoneFunc done_size */
+ T42_GlyphSlot_Init, /* FT_Slot_InitFunc init_slot */
+ T42_GlyphSlot_Done, /* FT_Slot_DoneFunc done_slot */
- T42_GlyphSlot_Load,
+ T42_GlyphSlot_Load, /* FT_Slot_LoadFunc load_glyph */
- 0, /* FT_Face_GetKerningFunc */
- 0, /* FT_Face_AttachFunc */
+ 0, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ 0, /* FT_Face_GetAdvancesFunc get_advances */
- 0, /* FT_Face_GetAdvancesFunc */
- T42_Size_Request,
- T42_Size_Select
+ T42_Size_Request, /* FT_Size_RequestFunc request_size */
+ T42_Size_Select /* FT_Size_SelectFunc select_size */
};
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 4bfa55a..1005a12 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -1161,32 +1161,32 @@
0x10000L,
0x20000L,
- 0,
+ 0, /* module-specific interface */
- 0, /* FT_Module_Constructor */
- 0, /* FT_Module_Destructor */
- winfnt_get_service
+ 0, /* FT_Module_Constructor module_init */
+ 0, /* FT_Module_Destructor module_done */
+ winfnt_get_service /* FT_Module_Requester get_interface */
},
sizeof ( FNT_FaceRec ),
sizeof ( FT_SizeRec ),
sizeof ( FT_GlyphSlotRec ),
- FNT_Face_Init,
- FNT_Face_Done,
- 0, /* FT_Size_InitFunc */
- 0, /* FT_Size_DoneFunc */
- 0, /* FT_Slot_InitFunc */
- 0, /* FT_Slot_DoneFunc */
+ FNT_Face_Init, /* FT_Face_InitFunc init_face */
+ FNT_Face_Done, /* FT_Face_DoneFunc done_face */
+ 0, /* FT_Size_InitFunc init_size */
+ 0, /* FT_Size_DoneFunc done_size */
+ 0, /* FT_Slot_InitFunc init_slot */
+ 0, /* FT_Slot_DoneFunc done_slot */
- FNT_Load_Glyph,
+ FNT_Load_Glyph, /* FT_Slot_LoadFunc load_glyph */
- 0, /* FT_Face_GetKerningFunc */
- 0, /* FT_Face_AttachFunc */
- 0, /* FT_Face_GetAdvancesFunc */
+ 0, /* FT_Face_GetKerningFunc get_kerning */
+ 0, /* FT_Face_AttachFunc attach_file */
+ 0, /* FT_Face_GetAdvancesFunc get_advances */
- FNT_Size_Request,
- FNT_Size_Select
+ FNT_Size_Request, /* FT_Size_RequestFunc request_size */
+ FNT_Size_Select /* FT_Size_SelectFunc select_size */
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 5179c89: Comments.,
Werner LEMBERG <=