[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 4188dea: Comments.
|
From: |
Werner LEMBERG |
|
Subject: |
[freetype2] master 4188dea: Comments. |
|
Date: |
Fri, 30 Oct 2015 07:08:08 +0000 |
branch: master
commit 4188deacf3ca89bbd8fb74707f7b70d0c3f8469d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Comments.
---
src/autofit/afmodule.c | 4 ++--
src/bdf/bdfdrivr.c | 4 ++--
src/cff/cffdrivr.c | 33 +++++++++++++++++++--------------
src/cid/cidriver.c | 24 +++++++++++++++---------
src/gxvalid/gxvmod.c | 4 ++--
src/otvalid/otvmod.c | 2 +-
src/pcf/pcfdrivr.c | 4 ++--
src/pfr/pfrdrivr.c | 6 +++---
src/psnames/psmodule.c | 32 ++++++++++++++++----------------
src/sfnt/sfdriver.c | 18 +++++++++---------
src/truetype/ttdriver.c | 19 +++++++++++--------
src/type1/t1driver.c | 28 ++++++++++++++--------------
src/type42/t42drivr.c | 17 +++++++++--------
src/winfonts/winfnt.c | 2 +-
14 files changed, 106 insertions(+), 91 deletions(-)
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index bbf1372..2c759da 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -262,8 +262,8 @@
FT_DEFINE_SERVICE_PROPERTIESREC(
af_service_properties,
- (FT_Properties_SetFunc)af_property_set,
- (FT_Properties_GetFunc)af_property_get )
+ (FT_Properties_SetFunc)af_property_set, /* set_property */
+ (FT_Properties_GetFunc)af_property_get ) /* get_property */
FT_DEFINE_SERVICEDESCREC1(
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 915299b..a381cf6 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -824,8 +824,8 @@ THE SOFTWARE.
static const FT_Service_BDFRec bdf_service_bdf =
{
- (FT_BDF_GetCharsetIdFunc)bdf_get_charset_id,
- (FT_BDF_GetPropertyFunc) bdf_get_bdf_property
+ (FT_BDF_GetCharsetIdFunc)bdf_get_charset_id, /* get_charset_id */
+ (FT_BDF_GetPropertyFunc) bdf_get_bdf_property /* get_property */
};
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 4028ab2..9fbc1eb 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -358,8 +358,8 @@
FT_DEFINE_SERVICE_GLYPHDICTREC(
cff_service_glyph_dict,
- (FT_GlyphDict_GetNameFunc) cff_get_glyph_name,
- (FT_GlyphDict_NameIndexFunc)cff_get_name_index
+ (FT_GlyphDict_GetNameFunc) cff_get_glyph_name, /* get_name */
+ (FT_GlyphDict_NameIndexFunc)cff_get_name_index /* name_index */
)
@@ -421,11 +421,13 @@
FT_DEFINE_SERVICE_PSINFOREC(
cff_service_ps_info,
- (PS_GetFontInfoFunc) cff_ps_get_font_info,
- (PS_GetFontExtraFunc) NULL,
- (PS_HasGlyphNamesFunc) cff_ps_has_glyph_names,
- (PS_GetFontPrivateFunc)NULL, /* unsupported with CFF fonts */
- (PS_GetFontValueFunc) NULL /* not implemented */
+ (PS_GetFontInfoFunc) cff_ps_get_font_info, /* ps_get_font_info */
+ (PS_GetFontExtraFunc) NULL, /* ps_get_font_extra */
+ (PS_HasGlyphNamesFunc) cff_ps_has_glyph_names, /* ps_has_glyph_names */
+ /* unsupported with CFF fonts */
+ (PS_GetFontPrivateFunc)NULL, /* ps_get_font_private */
+ /* not implemented */
+ (PS_GetFontValueFunc) NULL /* ps_get_font_value */
)
@@ -464,7 +466,7 @@
FT_DEFINE_SERVICE_PSFONTNAMEREC(
cff_service_ps_name,
- (FT_PsName_GetFunc)cff_get_ps_name
+ (FT_PsName_GetFunc)cff_get_ps_name /* get_ps_font_name */
)
@@ -511,7 +513,7 @@
FT_DEFINE_SERVICE_TTCMAPSREC(
cff_service_get_cmap_info,
- (TT_CMap_Info_GetFunc)cff_get_cmap_info
+ (TT_CMap_Info_GetFunc)cff_get_cmap_info /* get_cmap_info */
)
@@ -641,9 +643,12 @@
FT_DEFINE_SERVICE_CIDREC(
cff_service_cid_info,
- (FT_CID_GetRegistryOrderingSupplementFunc)cff_get_ros,
- (FT_CID_GetIsInternallyCIDKeyedFunc) cff_get_is_cid,
- (FT_CID_GetCIDFromGlyphIndexFunc) cff_get_cid_from_glyph_index
+ (FT_CID_GetRegistryOrderingSupplementFunc)
+ cff_get_ros, /* get_ros */
+ (FT_CID_GetIsInternallyCIDKeyedFunc)
+ cff_get_is_cid, /* get_is_cid */
+ (FT_CID_GetCIDFromGlyphIndexFunc)
+ cff_get_cid_from_glyph_index /* get_cid_from_glyph_index */
)
@@ -776,8 +781,8 @@
FT_DEFINE_SERVICE_PROPERTIESREC(
cff_service_properties,
- (FT_Properties_SetFunc)cff_property_set,
- (FT_Properties_GetFunc)cff_property_get )
+ (FT_Properties_SetFunc)cff_property_set, /* set_property */
+ (FT_Properties_GetFunc)cff_property_get ) /* get_property */
/*************************************************************************/
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index aca1f25..17935d0 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -59,7 +59,7 @@
static const FT_Service_PsFontNameRec cid_service_ps_name =
{
- (FT_PsName_GetFunc) cid_get_postscript_name
+ (FT_PsName_GetFunc)cid_get_postscript_name /* get_ps_font_name */
};
@@ -88,11 +88,14 @@
static const FT_Service_PsInfoRec cid_service_ps_info =
{
- (PS_GetFontInfoFunc) cid_ps_get_font_info,
- (PS_GetFontExtraFunc) cid_ps_get_font_extra,
- (PS_HasGlyphNamesFunc) NULL, /* unsupported with CID fonts */
- (PS_GetFontPrivateFunc)NULL, /* unsupported */
- (PS_GetFontValueFunc) NULL /* not implemented */
+ (PS_GetFontInfoFunc) cid_ps_get_font_info, /* ps_get_font_info */
+ (PS_GetFontExtraFunc) cid_ps_get_font_extra, /* ps_get_font_extra */
+ /* unsupported with CID fonts */
+ (PS_HasGlyphNamesFunc) NULL, /* ps_has_glyph_names */
+ /* unsupported */
+ (PS_GetFontPrivateFunc)NULL, /* ps_get_font_private */
+ /* not implemented */
+ (PS_GetFontValueFunc) NULL /* ps_get_font_value */
};
@@ -155,9 +158,12 @@
static const FT_Service_CIDRec cid_service_cid_info =
{
- (FT_CID_GetRegistryOrderingSupplementFunc)cid_get_ros,
- (FT_CID_GetIsInternallyCIDKeyedFunc) cid_get_is_cid,
- (FT_CID_GetCIDFromGlyphIndexFunc) cid_get_cid_from_glyph_index
+ (FT_CID_GetRegistryOrderingSupplementFunc)
+ cid_get_ros, /* get_ros */
+ (FT_CID_GetIsInternallyCIDKeyedFunc)
+ cid_get_is_cid, /* get_is_cid */
+ (FT_CID_GetCIDFromGlyphIndexFunc)
+ cid_get_cid_from_glyph_index /* get_cid_from_glyph_index */
};
diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c
index 17a02e7..fe8efdf 100644
--- a/src/gxvalid/gxvmod.c
+++ b/src/gxvalid/gxvmod.c
@@ -235,14 +235,14 @@
static
const FT_Service_GXvalidateRec gxvalid_interface =
{
- gxv_validate
+ gxv_validate /* validate */
};
static
const FT_Service_CKERNvalidateRec ckernvalid_interface =
{
- classic_kern_validate
+ classic_kern_validate /* validate */
};
diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c
index 92f8513..5eb691a 100644
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -240,7 +240,7 @@
static
const FT_Service_OTvalidateRec otvalid_interface =
{
- otv_validate
+ otv_validate /* validate */
};
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index 1c2725f..0996d10 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -659,8 +659,8 @@ THE SOFTWARE.
static const FT_Service_BDFRec pcf_service_bdf =
{
- (FT_BDF_GetCharsetIdFunc)pcf_get_charset_id,
- (FT_BDF_GetPropertyFunc) pcf_get_bdf_property
+ (FT_BDF_GetCharsetIdFunc)pcf_get_charset_id, /* get_charset_id */
+ (FT_BDF_GetPropertyFunc) pcf_get_bdf_property /* get_property */
};
diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c
index adbcac5..b079416 100644
--- a/src/pfr/pfrdrivr.c
+++ b/src/pfr/pfrdrivr.c
@@ -139,9 +139,9 @@
static
const FT_Service_PfrMetricsRec pfr_metrics_service_rec =
{
- pfr_get_metrics,
- pfr_face_get_kerning,
- pfr_get_advance
+ pfr_get_metrics, /* get_metrics */
+ pfr_face_get_kerning, /* get_kerning */
+ pfr_get_advance /* get_advance */
};
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 0f04c2f..5406098 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -525,31 +525,31 @@
FT_DEFINE_SERVICE_PSCMAPSREC(
pscmaps_interface,
- (PS_Unicode_ValueFunc) ps_unicode_value,
- (PS_Unicodes_InitFunc) ps_unicodes_init,
- (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index,
- (PS_Unicodes_CharNextFunc) ps_unicodes_char_next,
+ (PS_Unicode_ValueFunc) ps_unicode_value, /* unicode_value
*/
+ (PS_Unicodes_InitFunc) ps_unicodes_init, /* unicodes_init
*/
+ (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index, /* unicodes_char_index
*/
+ (PS_Unicodes_CharNextFunc) ps_unicodes_char_next, /* unicodes_char_next
*/
- (PS_Macintosh_NameFunc) ps_get_macintosh_name,
- (PS_Adobe_Std_StringsFunc) ps_get_standard_strings,
+ (PS_Macintosh_NameFunc) ps_get_macintosh_name, /* macintosh_name
*/
+ (PS_Adobe_Std_StringsFunc) ps_get_standard_strings, /* adobe_std_strings
*/
- t1_standard_encoding,
- t1_expert_encoding )
+ t1_standard_encoding, /* adobe_std_encoding
*/
+ t1_expert_encoding ) /*
adobe_expert_encoding */
#else
FT_DEFINE_SERVICE_PSCMAPSREC(
pscmaps_interface,
- NULL,
- NULL,
- NULL,
- NULL,
+ NULL, /* unicode_value
*/
+ NULL, /* unicodes_init
*/
+ NULL, /* unicodes_char_index
*/
+ NULL, /* unicodes_char_next
*/
- (PS_Macintosh_NameFunc) ps_get_macintosh_name,
- (PS_Adobe_Std_StringsFunc) ps_get_standard_strings,
+ (PS_Macintosh_NameFunc) ps_get_macintosh_name, /* macintosh_name
*/
+ (PS_Adobe_Std_StringsFunc) ps_get_standard_strings, /* adobe_std_strings
*/
- t1_standard_encoding,
- t1_expert_encoding )
+ t1_standard_encoding, /* adobe_std_encoding
*/
+ t1_expert_encoding ) /*
adobe_expert_encoding */
#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 6a3f0d9..5dd8449 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -139,9 +139,9 @@
FT_DEFINE_SERVICE_SFNT_TABLEREC(
sfnt_service_sfnt_table,
- (FT_SFNT_TableLoadFunc)tt_face_load_any,
- (FT_SFNT_TableGetFunc) get_sfnt_table,
- (FT_SFNT_TableInfoFunc)sfnt_table_info )
+ (FT_SFNT_TableLoadFunc)tt_face_load_any, /* load_table */
+ (FT_SFNT_TableGetFunc) get_sfnt_table, /* get_table */
+ (FT_SFNT_TableInfoFunc)sfnt_table_info ) /* table_info */
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
@@ -205,8 +205,8 @@
FT_DEFINE_SERVICE_GLYPHDICTREC(
sfnt_service_glyph_dict,
- (FT_GlyphDict_GetNameFunc) sfnt_get_glyph_name,
- (FT_GlyphDict_NameIndexFunc)sfnt_get_name_index )
+ (FT_GlyphDict_GetNameFunc) sfnt_get_glyph_name, /* get_name */
+ (FT_GlyphDict_NameIndexFunc)sfnt_get_name_index ) /* name_index */
#endif /* TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
@@ -330,7 +330,7 @@
FT_DEFINE_SERVICE_PSFONTNAMEREC(
sfnt_service_ps_name,
- (FT_PsName_GetFunc)sfnt_get_ps_name )
+ (FT_PsName_GetFunc)sfnt_get_ps_name ) /* get_ps_font_name */
/*
@@ -338,7 +338,7 @@
*/
FT_DEFINE_SERVICE_TTCMAPSREC(
tt_service_get_cmap_info,
- (TT_CMap_Info_GetFunc)tt_get_cmap_info )
+ (TT_CMap_Info_GetFunc)tt_get_cmap_info ) /* get_cmap_info */
#ifdef TT_CONFIG_OPTION_BDF
@@ -381,8 +381,8 @@
FT_DEFINE_SERVICE_BDFRec(
sfnt_service_bdf,
- (FT_BDF_GetCharsetIdFunc)sfnt_get_charset_id,
- (FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop )
+ (FT_BDF_GetCharsetIdFunc)sfnt_get_charset_id, /* get_charset_id */
+ (FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop ) /* get_property */
#endif /* TT_CONFIG_OPTION_BDF */
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 8b88b7e..1ba71f0 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -117,8 +117,8 @@
FT_DEFINE_SERVICE_PROPERTIESREC(
tt_service_properties,
- (FT_Properties_SetFunc)tt_property_set,
- (FT_Properties_GetFunc)tt_property_get )
+ (FT_Properties_SetFunc)tt_property_set, /* set_property */
+ (FT_Properties_GetFunc)tt_property_get ) /* get_property */
/*************************************************************************/
@@ -417,13 +417,14 @@
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_DEFINE_SERVICE_MULTIMASTERSREC(
tt_service_gx_multi_masters,
- (FT_Get_MM_Func) NULL,
- (FT_Set_MM_Design_Func) NULL,
- (FT_Set_MM_Blend_Func) TT_Set_MM_Blend,
- (FT_Get_MM_Var_Func) TT_Get_MM_Var,
- (FT_Set_Var_Design_Func)TT_Set_Var_Design )
+ (FT_Get_MM_Func) NULL, /* get_mm */
+ (FT_Set_MM_Design_Func) NULL, /* set_mm_design */
+ (FT_Set_MM_Blend_Func) TT_Set_MM_Blend, /* set_mm_blend */
+ (FT_Get_MM_Var_Func) TT_Get_MM_Var, /* get_mm_var */
+ (FT_Set_Var_Design_Func)TT_Set_Var_Design ) /* set_var_design */
#endif
+
static const FT_Service_TrueTypeEngineRec tt_service_truetype_engine =
{
#ifdef TT_USE_BYTECODE_INTERPRETER
@@ -441,9 +442,11 @@
#endif /* TT_USE_BYTECODE_INTERPRETER */
};
+
FT_DEFINE_SERVICE_TTGLYFREC(
tt_service_truetype_glyf,
- (TT_Glyf_GetLocationFunc)tt_face_get_location )
+ (TT_Glyf_GetLocationFunc)tt_face_get_location ) /* get_location */
+
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_DEFINE_SERVICEDESCREC5(
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index c0ca1e8..716dd55 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -87,8 +87,8 @@
static const FT_Service_GlyphDictRec t1_service_glyph_dict =
{
- (FT_GlyphDict_GetNameFunc) t1_get_glyph_name,
- (FT_GlyphDict_NameIndexFunc)t1_get_name_index
+ (FT_GlyphDict_GetNameFunc) t1_get_glyph_name, /* get_name */
+ (FT_GlyphDict_NameIndexFunc)t1_get_name_index /* name_index */
};
@@ -106,7 +106,7 @@
static const FT_Service_PsFontNameRec t1_service_ps_name =
{
- (FT_PsName_GetFunc)t1_get_ps_name
+ (FT_PsName_GetFunc)t1_get_ps_name /* get_ps_font_name */
};
@@ -118,11 +118,11 @@
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
static const FT_Service_MultiMastersRec t1_service_multi_masters =
{
- (FT_Get_MM_Func) T1_Get_Multi_Master,
- (FT_Set_MM_Design_Func) T1_Set_MM_Design,
- (FT_Set_MM_Blend_Func) T1_Set_MM_Blend,
- (FT_Get_MM_Var_Func) T1_Get_MM_Var,
- (FT_Set_Var_Design_Func)T1_Set_Var_Design
+ (FT_Get_MM_Func) T1_Get_Multi_Master, /* get_mm */
+ (FT_Set_MM_Design_Func) T1_Set_MM_Design, /* set_mm_design */
+ (FT_Set_MM_Blend_Func) T1_Set_MM_Blend, /* set_mm_blend */
+ (FT_Get_MM_Var_Func) T1_Get_MM_Var, /* get_mm_var */
+ (FT_Set_Var_Design_Func)T1_Set_Var_Design /* set_var_design */
};
#endif
@@ -567,18 +567,18 @@
static const FT_Service_PsInfoRec t1_service_ps_info =
{
- (PS_GetFontInfoFunc) t1_ps_get_font_info,
- (PS_GetFontExtraFunc) t1_ps_get_font_extra,
- (PS_HasGlyphNamesFunc) t1_ps_has_glyph_names,
- (PS_GetFontPrivateFunc)t1_ps_get_font_private,
- (PS_GetFontValueFunc) t1_ps_get_font_value,
+ (PS_GetFontInfoFunc) t1_ps_get_font_info, /* ps_get_font_info */
+ (PS_GetFontExtraFunc) t1_ps_get_font_extra, /* ps_get_font_extra */
+ (PS_HasGlyphNamesFunc) t1_ps_has_glyph_names, /* ps_has_glyph_names */
+ (PS_GetFontPrivateFunc)t1_ps_get_font_private, /* ps_get_font_private */
+ (PS_GetFontValueFunc) t1_ps_get_font_value, /* ps_get_font_value */
};
#ifndef T1_CONFIG_OPTION_NO_AFM
static const FT_Service_KerningRec t1_service_kerning =
{
- T1_Get_Track_Kerning,
+ T1_Get_Track_Kerning, /* get_track */
};
#endif
diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c
index da7d8e5..45ad0df 100644
--- a/src/type42/t42drivr.c
+++ b/src/type42/t42drivr.c
@@ -90,8 +90,8 @@
static const FT_Service_GlyphDictRec t42_service_glyph_dict =
{
- (FT_GlyphDict_GetNameFunc) t42_get_glyph_name,
- (FT_GlyphDict_NameIndexFunc)t42_get_name_index
+ (FT_GlyphDict_GetNameFunc) t42_get_glyph_name, /* get_name */
+ (FT_GlyphDict_NameIndexFunc)t42_get_name_index /* name_index */
};
@@ -110,7 +110,7 @@
static const FT_Service_PsFontNameRec t42_service_ps_font_name =
{
- (FT_PsName_GetFunc)t42_get_ps_font_name
+ (FT_PsName_GetFunc)t42_get_ps_font_name /* get_ps_font_name */
};
@@ -161,11 +161,12 @@
static const FT_Service_PsInfoRec t42_service_ps_info =
{
- (PS_GetFontInfoFunc) t42_ps_get_font_info,
- (PS_GetFontExtraFunc) t42_ps_get_font_extra,
- (PS_HasGlyphNamesFunc) t42_ps_has_glyph_names,
- (PS_GetFontPrivateFunc)t42_ps_get_font_private,
- (PS_GetFontValueFunc) NULL /* not implemented */
+ (PS_GetFontInfoFunc) t42_ps_get_font_info, /* ps_get_font_info */
+ (PS_GetFontExtraFunc) t42_ps_get_font_extra, /* ps_get_font_extra */
+ (PS_HasGlyphNamesFunc) t42_ps_has_glyph_names, /* ps_has_glyph_names */
+ (PS_GetFontPrivateFunc)t42_ps_get_font_private, /* ps_get_font_private */
+ /* not implemented */
+ (PS_GetFontValueFunc) NULL /* ps_get_font_value */
};
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 1005a12..acd31b1 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -1121,7 +1121,7 @@
static const FT_Service_WinFntRec winfnt_service_rec =
{
- winfnt_get_header
+ winfnt_get_header /* get_header */
};
/*
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 4188dea: Comments.,
Werner LEMBERG <=