diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-09-17 17:12:50 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-09-17 17:12:50 +0200 |
| commit | c95b7652d8db19530c91e80d23c288bbf27f1b72 (patch) | |
| tree | 626ae51680b7f26746b744fdfd4809e5f42edafe /src/cff/cffdrivr.c | |
| parent | d5f7533e8ec349f57d3669b5afc694a98f498d6e (diff) | |
| download | freetype2-c95b7652d8db19530c91e80d23c288bbf27f1b72.tar.gz | |
s/0/NULL/ for function pointers; comments, formatting.
Diffstat (limited to 'src/cff/cffdrivr.c')
| -rw-r--r-- | src/cff/cffdrivr.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 67bf09d8c..1d8d12e7b 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -358,6 +358,7 @@ FT_DEFINE_SERVICE_GLYPHDICTREC( cff_service_glyph_dict, + (FT_GlyphDict_GetNameFunc) cff_get_glyph_name, /* get_name */ (FT_GlyphDict_NameIndexFunc)cff_get_name_index /* name_index */ ) @@ -421,6 +422,7 @@ FT_DEFINE_SERVICE_PSINFOREC( cff_service_ps_info, + (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 */ @@ -466,6 +468,7 @@ FT_DEFINE_SERVICE_PSFONTNAMEREC( cff_service_ps_name, + (FT_PsName_GetFunc)cff_get_ps_name /* get_ps_font_name */ ) @@ -513,6 +516,7 @@ FT_DEFINE_SERVICE_TTCMAPSREC( cff_service_get_cmap_info, + (TT_CMap_Info_GetFunc)cff_get_cmap_info /* get_cmap_info */ ) @@ -643,6 +647,7 @@ FT_DEFINE_SERVICE_CIDREC( cff_service_cid_info, + (FT_CID_GetRegistryOrderingSupplementFunc) cff_get_ros, /* get_ros */ (FT_CID_GetIsInternallyCIDKeyedFunc) @@ -855,6 +860,7 @@ FT_DEFINE_SERVICE_PROPERTIESREC( cff_service_properties, + (FT_Properties_SetFunc)cff_property_set, /* set_property */ (FT_Properties_GetFunc)cff_property_get ) /* get_property */ @@ -874,6 +880,7 @@ #ifndef FT_CONFIG_OPTION_NO_GLYPH_NAMES FT_DEFINE_SERVICEDESCREC7( cff_services, + FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_CFF, FT_SERVICE_ID_POSTSCRIPT_INFO, &CFF_SERVICE_PS_INFO_GET, FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &CFF_SERVICE_PS_NAME_GET, @@ -885,6 +892,7 @@ #else FT_DEFINE_SERVICEDESCREC6( cff_services, + FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_CFF, FT_SERVICE_ID_POSTSCRIPT_INFO, &CFF_SERVICE_PS_INFO_GET, FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &CFF_SERVICE_PS_NAME_GET, @@ -954,7 +962,7 @@ 0x10000L, 0x20000L, - 0, /* module-specific interface */ + NULL, /* module-specific interface */ cff_driver_init, /* FT_Module_Constructor module_init */ cff_driver_done, /* FT_Module_Destructor module_done */ @@ -974,7 +982,7 @@ cff_glyph_load, /* FT_Slot_LoadFunc load_glyph */ cff_get_kerning, /* FT_Face_GetKerningFunc get_kerning */ - 0, /* FT_Face_AttachFunc attach_file */ + NULL, /* FT_Face_AttachFunc attach_file */ cff_get_advances, /* FT_Face_GetAdvancesFunc get_advances */ cff_size_request, /* FT_Size_RequestFunc request_size */ |