[Git][freetype/freetype][master] */*: Remove many function pointer casts.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 2fb8eda5
  by Ben Wagner at 2023-06-03T06:58:09+02:00

  */*: Remove many function pointer casts.
  
  In C it is undefined behavior to call a function through a function pointer
  of a different type.  This is now detected by the Control Flow Integrity
  Sanitizer.  All known issues have already been fixed.  Prevent any
  accidental re-introduction by removing function pointer casts when defining
  services.  The services will call the service functions through the function
  pointers on the service.  As a result the functions must have the same type
  so there should be no need to cast.  Removing the casts allows compilers to
  warn about assignment to an incompatible function pointer type.
  

10 changed files:

• src/autofit/afmodule.c
• src/cff/cffdrivr.c
• src/cid/cidriver.c
• src/psnames/psmodule.c
• src/raster/ftraster.c
• src/raster/ftrend1.c
• src/sfnt/sfdriver.c
• src/svg/ftsvg.c
• src/truetype/ttdriver.c
• src/type1/t1driver.c

Changes:

src/autofit/afmodule.c

---

...	...	@@ -372,8 +372,9 @@
372	372	FT_DEFINE_SERVICE_PROPERTIESREC(
373	373	af_service_properties,
374	374
375		- (FT_Properties_SetFunc)af_property_set, /* set_property */
376		- (FT_Properties_GetFunc)af_property_get ) /* get_property */
	375	+ af_property_set, /* FT_Properties_SetFunc set_property */
	376	+ af_property_get /* FT_Properties_GetFunc get_property */
	377	+ )
377	378
378	379
379	380	FT_DEFINE_SERVICEDESCREC1(
...	...	@@ -499,10 +500,10 @@
499	500	FT_DEFINE_AUTOHINTER_INTERFACE(
500	501	af_autofitter_interface,
501	502
502		- NULL, /* reset_face */
503		- NULL, /* get_global_hints */
504		- NULL, /* done_global_hints */
505		- (FT_AutoHinter_GlyphLoadFunc)af_autofitter_load_glyph /* load_glyph */
	503	+ NULL, /* FT_AutoHinter_GlobalResetFunc reset_face */
	504	+ NULL, /* FT_AutoHinter_GlobalGetFunc get_global_hints */
	505	+ NULL, /* FT_AutoHinter_GlobalDoneFunc done_global_hints */
	506	+ af_autofitter_load_glyph /* FT_AutoHinter_GlyphLoadFunc load_glyph */
506	507	)
507	508
508	509	FT_DEFINE_MODULE(
...	...	@@ -517,9 +518,9 @@
517	518
518	519	(const void*)&af_autofitter_interface,
519	520
520		- (FT_Module_Constructor)af_autofitter_init, /* module_init */
521		- (FT_Module_Destructor) af_autofitter_done, /* module_done */
522		- (FT_Module_Requester) af_get_interface /* get_interface */
	521	+ af_autofitter_init, /* FT_Module_Constructor module_init */
	522	+ af_autofitter_done, /* FT_Module_Destructor module_done */
	523	+ af_get_interface /* FT_Module_Requester get_interface */
523	524	)
524	525
525	526

src/cff/cffdrivr.c

---

...	...	@@ -442,8 +442,8 @@
442	442	FT_DEFINE_SERVICE_GLYPHDICTREC(
443	443	cff_service_glyph_dict,
444	444
445		- (FT_GlyphDict_GetNameFunc) cff_get_glyph_name, /* get_name */
446		- (FT_GlyphDict_NameIndexFunc)cff_get_name_index /* name_index */
	445	+ cff_get_glyph_name, /* FT_GlyphDict_GetNameFunc get_name */
	446	+ cff_get_name_index /* FT_GlyphDict_NameIndexFunc name_index */
447	447	)
448	448
449	449
...	...	@@ -592,13 +592,13 @@
592	592	FT_DEFINE_SERVICE_PSINFOREC(
593	593	cff_service_ps_info,
594	594
595		- (PS_GetFontInfoFunc) cff_ps_get_font_info, /* ps_get_font_info */
596		- (PS_GetFontExtraFunc) cff_ps_get_font_extra, /* ps_get_font_extra */
597		- (PS_HasGlyphNamesFunc) cff_ps_has_glyph_names, /* ps_has_glyph_names */
	595	+ cff_ps_get_font_info, /* PS_GetFontInfoFunc ps_get_font_info */
	596	+ cff_ps_get_font_extra, /* PS_GetFontExtraFunc ps_get_font_extra */
	597	+ cff_ps_has_glyph_names, /* PS_HasGlyphNamesFunc ps_has_glyph_names */
598	598	/* unsupported with CFF fonts */
599		- (PS_GetFontPrivateFunc)NULL, /* ps_get_font_private */
	599	+ NULL, /* PS_GetFontPrivateFunc ps_get_font_private */
600	600	/* not implemented */
601		- (PS_GetFontValueFunc) NULL /* ps_get_font_value */
	601	+ NULL /* PS_GetFontValueFunc ps_get_font_value */
602	602	)
603	603
604	604
...	...	@@ -640,7 +640,7 @@
640	640	FT_DEFINE_SERVICE_PSFONTNAMEREC(
641	641	cff_service_ps_name,
642	642
643		- (FT_PsName_GetFunc)cff_get_ps_name /* get_ps_font_name */
	643	+ cff_get_ps_name /* FT_PsName_GetFunc get_ps_font_name */
644	644	)
645	645
646	646
...	...	@@ -688,7 +688,7 @@
688	688	FT_DEFINE_SERVICE_TTCMAPSREC(
689	689	cff_service_get_cmap_info,
690	690
691		- (TT_CMap_Info_GetFunc)cff_get_cmap_info /* get_cmap_info */
	691	+ cff_get_cmap_info /* TT_CMap_Info_GetFunc get_cmap_info */
692	692	)
693	693
694	694
...	...	@@ -820,12 +820,12 @@
820	820	FT_DEFINE_SERVICE_CIDREC(
821	821	cff_service_cid_info,
822	822
823		- (FT_CID_GetRegistryOrderingSupplementFunc)
824		- cff_get_ros, /* get_ros */
825		- (FT_CID_GetIsInternallyCIDKeyedFunc)
826		- cff_get_is_cid, /* get_is_cid */
827		- (FT_CID_GetCIDFromGlyphIndexFunc)
828		- cff_get_cid_from_glyph_index /* get_cid_from_glyph_index */
	823	+ cff_get_ros,
	824	+ /* FT_CID_GetRegistryOrderingSupplementFunc get_ros */
	825	+ cff_get_is_cid,
	826	+ /* FT_CID_GetIsInternallyCIDKeyedFunc get_is_cid */
	827	+ cff_get_cid_from_glyph_index
	828	+ /* FT_CID_GetCIDFromGlyphIndexFunc get_cid_from_glyph_index */
829	829	)
830	830
831	831
...	...	@@ -837,9 +837,9 @@
837	837	FT_DEFINE_SERVICE_PROPERTIESREC(
838	838	cff_service_properties,
839	839
840		- (FT_Properties_SetFunc)ps_property_set, /* set_property */
841		- (FT_Properties_GetFunc)ps_property_get ) /* get_property */
842		-
	840	+ ps_property_set, /* FT_Properties_SetFunc set_property */
	841	+ ps_property_get /* FT_Properties_GetFunc get_property */
	842	+ )
843	843
844	844	#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
845	845
...	...	@@ -1044,45 +1044,35 @@
1044	1044	FT_DEFINE_SERVICE_MULTIMASTERSREC(
1045	1045	cff_service_multi_masters,
1046	1046
1047		- (FT_Get_MM_Func) NULL, /* get_mm */
1048		- (FT_Set_MM_Design_Func) NULL, /* set_mm_design */
1049		- (FT_Set_MM_Blend_Func) cff_set_mm_blend, /* set_mm_blend */
1050		- (FT_Get_MM_Blend_Func) cff_get_mm_blend, /* get_mm_blend */
1051		- (FT_Get_MM_Var_Func) cff_get_mm_var, /* get_mm_var */
1052		- (FT_Set_Var_Design_Func)cff_set_var_design, /* set_var_design */
1053		- (FT_Get_Var_Design_Func)cff_get_var_design, /* get_var_design */
1054		- (FT_Set_Named_Instance_Func)
1055		- cff_set_named_instance,
1056		- /* set_named_instance */
1057		- (FT_Get_Default_Named_Instance_Func)
1058		- cff_get_default_named_instance,
1059		- /* get_default_named_instance */
1060		- (FT_Set_MM_WeightVector_Func)
1061		- cff_set_mm_weightvector,
1062		- /* set_mm_weightvector */
1063		- (FT_Get_MM_WeightVector_Func)
1064		- cff_get_mm_weightvector,
1065		- /* get_mm_weightvector */
1066		-
1067		- (FT_Construct_PS_Name_Func)
1068		- cff_construct_ps_name,
1069		- /* construct_ps_name */
1070		- (FT_Var_Load_Delta_Set_Idx_Map_Func)
1071		- cff_load_delta_set_index_mapping,
1072		- /* load_delta_set_idx_map */
1073		- (FT_Var_Load_Item_Var_Store_Func)
1074		- cff_load_item_variation_store,
1075		- /* load_item_variation_store */
1076		- (FT_Var_Get_Item_Delta_Func)
1077		- cff_get_item_delta, /* get_item_delta */
1078		- (FT_Var_Done_Item_Var_Store_Func)
1079		- cff_done_item_variation_store,
1080		- /* done_item_variation_store */
1081		- (FT_Var_Done_Delta_Set_Idx_Map_Func)
1082		- cff_done_delta_set_index_map,
1083		- /* done_delta_set_index_map */
1084		- (FT_Get_Var_Blend_Func) cff_get_var_blend, /* get_var_blend */
1085		- (FT_Done_Blend_Func) cff_done_blend /* done_blend */
	1047	+ NULL, /* FT_Get_MM_Func get_mm */
	1048	+ NULL, /* FT_Set_MM_Design_Func set_mm_design */
	1049	+ cff_set_mm_blend, /* FT_Set_MM_Blend_Func set_mm_blend */
	1050	+ cff_get_mm_blend, /* FT_Get_MM_Blend_Func get_mm_blend */
	1051	+ cff_get_mm_var, /* FT_Get_MM_Var_Func get_mm_var */
	1052	+ cff_set_var_design, /* FT_Set_Var_Design_Func set_var_design */
	1053	+ cff_get_var_design, /* FT_Get_Var_Design_Func get_var_design */
	1054	+ cff_set_named_instance,
	1055	+ /* FT_Set_Named_Instance_Func set_named_instance */
	1056	+ cff_get_default_named_instance,
	1057	+ /* FT_Get_Default_Named_Instance_Func get_default_named_instance */
	1058	+ cff_set_mm_weightvector,
	1059	+ /* FT_Set_MM_WeightVector_Func set_mm_weightvector */
	1060	+ cff_get_mm_weightvector,
	1061	+ /* FT_Get_MM_WeightVector_Func get_mm_weightvector */
	1062	+ cff_construct_ps_name,
	1063	+ /* FT_Construct_PS_Name_Func construct_ps_name */
	1064	+ cff_load_delta_set_index_mapping,
	1065	+ /* FT_Var_Load_Delta_Set_Idx_Map_Func load_delta_set_idx_map */
	1066	+ cff_load_item_variation_store,
	1067	+ /* FT_Var_Load_Item_Var_Store_Func load_item_variation_store */
	1068	+ cff_get_item_delta,
	1069	+ /* FT_Var_Get_Item_Delta_Func get_item_delta */
	1070	+ cff_done_item_variation_store,
	1071	+ /* FT_Var_Done_Item_Var_Store_Func done_item_variation_store */
	1072	+ cff_done_delta_set_index_map,
	1073	+ /* FT_Var_Done_Delta_Set_Idx_Map_Func done_delta_set_index_map */
	1074	+ cff_get_var_blend, /* FT_Get_Var_Blend_Func get_var_blend */
	1075	+ cff_done_blend /* FT_Done_Blend_Func done_blend */
1086	1076	)
1087	1077
1088	1078
...	...	@@ -1120,17 +1110,17 @@
1120	1110	FT_DEFINE_SERVICE_METRICSVARIATIONSREC(
1121	1111	cff_service_metrics_variations,
1122	1112
1123		- (FT_HAdvance_Adjust_Func)cff_hadvance_adjust, /* hadvance_adjust */
1124		- (FT_LSB_Adjust_Func) NULL, /* lsb_adjust */
1125		- (FT_RSB_Adjust_Func) NULL, /* rsb_adjust */
	1113	+ cff_hadvance_adjust, /* FT_HAdvance_Adjust_Func hadvance_adjust */
	1114	+ NULL, /* FT_LSB_Adjust_Func lsb_adjust */
	1115	+ NULL, /* FT_RSB_Adjust_Func rsb_adjust */
1126	1116
1127		- (FT_VAdvance_Adjust_Func)NULL, /* vadvance_adjust */
1128		- (FT_TSB_Adjust_Func) NULL, /* tsb_adjust */
1129		- (FT_BSB_Adjust_Func) NULL, /* bsb_adjust */
1130		- (FT_VOrg_Adjust_Func) NULL, /* vorg_adjust */
	1117	+ NULL, /* FT_VAdvance_Adjust_Func vadvance_adjust */
	1118	+ NULL, /* FT_TSB_Adjust_Func tsb_adjust */
	1119	+ NULL, /* FT_BSB_Adjust_Func bsb_adjust */
	1120	+ NULL, /* FT_VOrg_Adjust_Func vorg_adjust */
1131	1121
1132		- (FT_Metrics_Adjust_Func) cff_metrics_adjust, /* metrics_adjust */
1133		- (FT_Size_Reset_Func) NULL /* size_reset */
	1122	+ cff_metrics_adjust, /* FT_Metrics_Adjust_Func metrics_adjust */
	1123	+ NULL /* FT_Size_Reset_Func size_reset */
1134	1124	)
1135	1125	#endif
1136	1126
...	...	@@ -1143,11 +1133,11 @@
1143	1133	FT_DEFINE_SERVICE_CFFLOADREC(
1144	1134	cff_service_cff_load,
1145	1135
1146		- (FT_Get_Standard_Encoding_Func)cff_get_standard_encoding,
1147		- (FT_Load_Private_Dict_Func) cff_load_private_dict,
1148		- (FT_FD_Select_Get_Func) cff_fd_select_get,
1149		- (FT_Blend_Check_Vector_Func) cff_blend_check_vector,
1150		- (FT_Blend_Build_Vector_Func) cff_blend_build_vector
	1136	+ cff_get_standard_encoding, /* FT_Get_Standard_Encoding_Func get_standard_encoding */
	1137	+ cff_load_private_dict, /* FT_Load_Private_Dict_Func load_private_dict */
	1138	+ cff_fd_select_get, /* FT_FD_Select_Get_Func fd_select_get */
	1139	+ cff_blend_check_vector, /* FT_Blend_Check_Vector_Func blend_check_vector */
	1140	+ cff_blend_build_vector /* FT_Blend_Build_Vector_Func blend_build_vector */
1151	1141	)
1152	1142
1153	1143

src/cid/cidriver.c

---

...	...	@@ -95,14 +95,14 @@
95	95
96	96	static const FT_Service_PsInfoRec cid_service_ps_info =
97	97	{
98		- (PS_GetFontInfoFunc) cid_ps_get_font_info, /* ps_get_font_info */
99		- (PS_GetFontExtraFunc) cid_ps_get_font_extra, /* ps_get_font_extra */
	98	+ cid_ps_get_font_info, /* PS_GetFontInfoFunc ps_get_font_info */
	99	+ cid_ps_get_font_extra, /* PS_GetFontExtraFunc ps_get_font_extra */
100	100	/* unsupported with CID fonts */
101		- (PS_HasGlyphNamesFunc) NULL, /* ps_has_glyph_names */
	101	+ NULL, /* PS_HasGlyphNamesFunc ps_has_glyph_names */
102	102	/* unsupported */
103		- (PS_GetFontPrivateFunc)NULL, /* ps_get_font_private */
	103	+ NULL, /* PS_GetFontPrivateFunc ps_get_font_private */
104	104	/* not implemented */
105		- (PS_GetFontValueFunc) NULL /* ps_get_font_value */
	105	+ NULL /* PS_GetFontValueFunc ps_get_font_value */
106	106	};
107	107
108	108
...	...	@@ -182,12 +182,12 @@
182	182
183	183	static const FT_Service_CIDRec cid_service_cid_info =
184	184	{
185		- (FT_CID_GetRegistryOrderingSupplementFunc)
186		- cid_get_ros, /* get_ros */
187		- (FT_CID_GetIsInternallyCIDKeyedFunc)
188		- cid_get_is_cid, /* get_is_cid */
189		- (FT_CID_GetCIDFromGlyphIndexFunc)
190		- cid_get_cid_from_glyph_index /* get_cid_from_glyph_index */
	185	+ cid_get_ros,
	186	+ /* FT_CID_GetRegistryOrderingSupplementFunc get_ros */
	187	+ cid_get_is_cid,
	188	+ /* FT_CID_GetIsInternallyCIDKeyedFunc get_is_cid */
	189	+ cid_get_cid_from_glyph_index
	190	+ /* FT_CID_GetCIDFromGlyphIndexFunc get_cid_from_glyph_index */
191	191	};
192	192
193	193
...	...	@@ -199,9 +199,9 @@
199	199	FT_DEFINE_SERVICE_PROPERTIESREC(
200	200	cid_service_properties,
201	201
202		- (FT_Properties_SetFunc)ps_property_set, /* set_property */
203		- (FT_Properties_GetFunc)ps_property_get ) /* get_property */
204		-
	202	+ ps_property_set, /* FT_Properties_SetFunc set_property */
	203	+ ps_property_get /* FT_Properties_GetFunc get_property */
	204	+ )
205	205
206	206	/*
207	207	* SERVICE LIST

src/psnames/psmodule.c

---

...	...	@@ -543,13 +543,13 @@
543	543	FT_DEFINE_SERVICE_PSCMAPSREC(
544	544	pscmaps_interface,
545	545
546		- (PS_Unicode_ValueFunc) ps_unicode_value, /* unicode_value */
547		- (PS_Unicodes_InitFunc) ps_unicodes_init, /* unicodes_init */
548		- (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index, /* unicodes_char_index */
549		- (PS_Unicodes_CharNextFunc) ps_unicodes_char_next, /* unicodes_char_next */
	546	+ ps_unicode_value, /* PS_Unicode_ValueFunc unicode_value */
	547	+ ps_unicodes_init, /* PS_Unicodes_InitFunc unicodes_init */
	548	+ ps_unicodes_char_index, /* PS_Unicodes_CharIndexFunc unicodes_char_index */
	549	+ ps_unicodes_char_next, /* PS_Unicodes_CharNextFunc unicodes_char_next */
550	550
551		- (PS_Macintosh_NameFunc) ps_get_macintosh_name, /* macintosh_name */
552		- (PS_Adobe_Std_StringsFunc) ps_get_standard_strings, /* adobe_std_strings */
	551	+ ps_get_macintosh_name, /* PS_Macintosh_NameFunc macintosh_name */
	552	+ ps_get_standard_strings, /* PS_Adobe_Std_StringsFunc adobe_std_strings */
553	553
554	554	t1_standard_encoding, /* adobe_std_encoding */
555	555	t1_expert_encoding /* adobe_expert_encoding */
...	...	@@ -560,13 +560,13 @@
560	560	FT_DEFINE_SERVICE_PSCMAPSREC(
561	561	pscmaps_interface,
562	562
563		- NULL, /* unicode_value */
564		- NULL, /* unicodes_init */
565		- NULL, /* unicodes_char_index */
566		- NULL, /* unicodes_char_next */
	563	+ NULL, /* PS_Unicode_ValueFunc unicode_value */
	564	+ NULL, /* PS_Unicodes_InitFunc unicodes_init */
	565	+ NULL, /* PS_Unicodes_CharIndexFunc unicodes_char_index */
	566	+ NULL, /* PS_Unicodes_CharNextFunc unicodes_char_next */
567	567
568		- (PS_Macintosh_NameFunc) ps_get_macintosh_name, /* macintosh_name */
569		- (PS_Adobe_Std_StringsFunc) ps_get_standard_strings, /* adobe_std_strings */
	568	+ ps_get_macintosh_name, /* PS_Macintosh_NameFunc macintosh_name */
	569	+ ps_get_standard_strings, /* PS_Adobe_Std_StringsFunc adobe_std_strings */
570	570
571	571	t1_standard_encoding, /* adobe_std_encoding */
572	572	t1_expert_encoding /* adobe_expert_encoding */
...	...	@@ -612,9 +612,9 @@
612	612	PUT_PS_NAMES_SERVICE(
613	613	(void*)&pscmaps_interface ), /* module specific interface */
614	614
615		- (FT_Module_Constructor)NULL, /* module_init */
616		- (FT_Module_Destructor) NULL, /* module_done */
617		- (FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) /* get_interface */
	615	+ NULL, /* FT_Module_Constructor module_init */
	616	+ NULL, /* FT_Module_Destructor module_done */
	617	+ PUT_PS_NAMES_SERVICE( psnames_get_service ) /* FT_Module_Requester get_interface */
618	618	)
619	619
620	620

src/raster/ftraster.c

---

...	...	@@ -3283,11 +3283,11 @@
3283	3283
3284	3284	FT_GLYPH_FORMAT_OUTLINE,
3285	3285
3286		- (FT_Raster_New_Func) ft_black_new, /* raster_new */
3287		- (FT_Raster_Reset_Func) ft_black_reset, /* raster_reset */
3288		- (FT_Raster_Set_Mode_Func)ft_black_set_mode, /* raster_set_mode */
3289		- (FT_Raster_Render_Func) ft_black_render, /* raster_render */
3290		- (FT_Raster_Done_Func) ft_black_done /* raster_done */
	3286	+ ft_black_new, /* FT_Raster_New_Func raster_new */
	3287	+ ft_black_reset, /* FT_Raster_Reset_Func raster_reset */
	3288	+ ft_black_set_mode, /* FT_Raster_Set_Mode_Func raster_set_mode */
	3289	+ ft_black_render, /* FT_Raster_Render_Func raster_render */
	3290	+ ft_black_done /* FT_Raster_Done_Func raster_done */
3291	3291	)
3292	3292
3293	3293

src/raster/ftrend1.c

---

...	...	@@ -191,18 +191,18 @@
191	191
192	192	NULL, /* module specific interface */
193	193
194		- (FT_Module_Constructor)ft_raster1_init, /* module_init */
195		- (FT_Module_Destructor) NULL, /* module_done */
196		- (FT_Module_Requester) NULL, /* get_interface */
	194	+ ft_raster1_init, /* FT_Module_Constructor module_init */
	195	+ NULL, /* FT_Module_Destructor module_done */
	196	+ NULL, /* FT_Module_Requester get_interface */
197	197
198	198	FT_GLYPH_FORMAT_OUTLINE,
199	199
200		- (FT_Renderer_RenderFunc) ft_raster1_render, /* render_glyph */
201		- (FT_Renderer_TransformFunc)ft_raster1_transform, /* transform_glyph */
202		- (FT_Renderer_GetCBoxFunc) ft_raster1_get_cbox, /* get_glyph_cbox */
203		- (FT_Renderer_SetModeFunc) ft_raster1_set_mode, /* set_mode */
	200	+ ft_raster1_render, /* FT_Renderer_RenderFunc render_glyph */
	201	+ ft_raster1_transform, /* FT_Renderer_TransformFunc transform_glyph */
	202	+ ft_raster1_get_cbox, /* FT_Renderer_GetCBoxFunc get_glyph_cbox */
	203	+ ft_raster1_set_mode, /* FT_Renderer_SetModeFunc set_mode */
204	204
205		- (FT_Raster_Funcs*)&ft_standard_raster /* raster_class */
	205	+ &ft_standard_raster /* FT_Raster_Funcs* raster_class */
206	206	)
207	207
208	208

src/sfnt/sfdriver.c

---

...	...	@@ -172,9 +172,9 @@
172	172	FT_DEFINE_SERVICE_SFNT_TABLEREC(
173	173	sfnt_service_sfnt_table,
174	174
175		- (FT_SFNT_TableLoadFunc)sfnt_load_table, /* load_table */
176		- (FT_SFNT_TableGetFunc) get_sfnt_table, /* get_table */
177		- (FT_SFNT_TableInfoFunc)sfnt_table_info /* table_info */
	175	+ sfnt_load_table, /* FT_SFNT_TableLoadFunc load_table */
	176	+ get_sfnt_table, /* FT_SFNT_TableGetFunc get_table */
	177	+ sfnt_table_info /* FT_SFNT_TableInfoFunc table_info */
178	178	)
179	179
180	180
...	...	@@ -240,8 +240,8 @@
240	240	FT_DEFINE_SERVICE_GLYPHDICTREC(
241	241	sfnt_service_glyph_dict,
242	242
243		- (FT_GlyphDict_GetNameFunc) sfnt_get_glyph_name, /* get_name */
244		- (FT_GlyphDict_NameIndexFunc)sfnt_get_name_index /* name_index */
	243	+ sfnt_get_glyph_name, /* FT_GlyphDict_GetNameFunc get_name */
	244	+ sfnt_get_name_index /* FT_GlyphDict_NameIndexFunc name_index */
245	245	)
246	246
247	247	#endif /* TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
...	...	@@ -1113,7 +1113,7 @@
1113	1113	FT_DEFINE_SERVICE_PSFONTNAMEREC(
1114	1114	sfnt_service_ps_name,
1115	1115
1116		- (FT_PsName_GetFunc)sfnt_get_ps_name /* get_ps_font_name */
	1116	+ sfnt_get_ps_name /* FT_PsName_GetFunc get_ps_font_name */
1117	1117	)
1118	1118
1119	1119
...	...	@@ -1123,7 +1123,7 @@
1123	1123	FT_DEFINE_SERVICE_TTCMAPSREC(
1124	1124	tt_service_get_cmap_info,
1125	1125
1126		- (TT_CMap_Info_GetFunc)tt_get_cmap_info /* get_cmap_info */
	1126	+ tt_get_cmap_info /* TT_CMap_Info_GetFunc get_cmap_info */
1127	1127	)
1128	1128
1129	1129
...	...	@@ -1168,8 +1168,8 @@
1168	1168	FT_DEFINE_SERVICE_BDFRec(
1169	1169	sfnt_service_bdf,
1170	1170
1171		- (FT_BDF_GetCharsetIdFunc)sfnt_get_charset_id, /* get_charset_id */
1172		- (FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop /* get_property */
	1171	+ sfnt_get_charset_id, /* FT_BDF_GetCharsetIdFunc get_charset_id */
	1172	+ tt_face_find_bdf_prop /* FT_BDF_GetPropertyFunc get_property */
1173	1173	)
1174	1174
1175	1175
...	...	@@ -1360,9 +1360,9 @@
1360	1360
1361	1361	(const void*)&sfnt_interface, /* module specific interface */
1362	1362
1363		- (FT_Module_Constructor)NULL, /* module_init */
1364		- (FT_Module_Destructor) NULL, /* module_done */
1365		- (FT_Module_Requester) sfnt_get_interface /* get_interface */
	1363	+ NULL, /* FT_Module_Constructor module_init */
	1364	+ NULL, /* FT_Module_Destructor module_done */
	1365	+ sfnt_get_interface /* FT_Module_Requester get_interface */
1366	1366	)
1367	1367
1368	1368

src/svg/ftsvg.c

---

...	...	@@ -153,7 +153,7 @@
153	153
154	154	static const SVG_Interface svg_interface =
155	155	{
156		- (Preset_Bitmap_Func)ft_svg_preset_slot
	156	+ ft_svg_preset_slot /* Preset_Bitmap_Func preset_slot */
157	157	};
158	158
159	159
...	...	@@ -231,8 +231,8 @@
231	231	FT_DEFINE_SERVICE_PROPERTIESREC(
232	232	ft_svg_service_properties,
233	233
234		- (FT_Properties_SetFunc)ft_svg_property_set, /* set_property */
235		- (FT_Properties_GetFunc)ft_svg_property_get /* get_property */
	234	+ ft_svg_property_set, /* FT_Properties_SetFunc set_property */
	235	+ ft_svg_property_get /* FT_Properties_GetFunc get_property */
236	236	)
237	237
238	238
...	...	@@ -338,17 +338,17 @@
338	338
339	339	(const void*)PUT_SVG_MODULE( &svg_interface ), /* module specific interface */
340	340
341		- (FT_Module_Constructor)PUT_SVG_MODULE( ft_svg_init ), /* module_init */
342		- (FT_Module_Destructor)PUT_SVG_MODULE( ft_svg_done ), /* module_done */
343		- PUT_SVG_MODULE( ft_svg_get_interface ), /* get_interface */
	341	+ PUT_SVG_MODULE( ft_svg_init ), /* FT_Module_Constructor module_init */
	342	+ PUT_SVG_MODULE( ft_svg_done ), /* FT_Module_Destructor module_done */
	343	+ PUT_SVG_MODULE( ft_svg_get_interface ), /* FT_Module_Requester get_interface */
344	344
345	345	SVG_GLYPH_FORMAT,
346	346
347		- (FT_Renderer_RenderFunc) PUT_SVG_MODULE( ft_svg_render ), /* render_glyph */
348		- (FT_Renderer_TransformFunc)PUT_SVG_MODULE( ft_svg_transform ), /* transform_glyph */
349		- NULL, /* get_glyph_cbox */
350		- NULL, /* set_mode */
351		- NULL /* raster_class */
	347	+ PUT_SVG_MODULE( ft_svg_render ), /* FT_Renderer_RenderFunc render_glyph */
	348	+ PUT_SVG_MODULE( ft_svg_transform ), /* FT_Renderer_TransformFunc transform_glyph */
	349	+ NULL, /* FT_Renderer_GetCBoxFunc get_glyph_cbox */
	350	+ NULL, /* FT_Renderer_SetModeFunc set_mode */
	351	+ NULL /* FT_Raster_Funcs* raster_class */
352	352	)
353	353
354	354

src/truetype/ttdriver.c

---

...	...	@@ -154,8 +154,8 @@
154	154	FT_DEFINE_SERVICE_PROPERTIESREC(
155	155	tt_service_properties,
156	156
157		- (FT_Properties_SetFunc)tt_property_set, /* set_property */
158		- (FT_Properties_GetFunc)tt_property_get /* get_property */
	157	+ tt_property_set, /* FT_Properties_SetFunc set_property */
	158	+ tt_property_get /* FT_Properties_GetFunc get_property */
159	159	)
160	160
161	161
...	...	@@ -517,57 +517,47 @@
517	517	FT_DEFINE_SERVICE_MULTIMASTERSREC(
518	518	tt_service_gx_multi_masters,
519	519
520		- (FT_Get_MM_Func) NULL, /* get_mm */
521		- (FT_Set_MM_Design_Func) NULL, /* set_mm_design */
522		- (FT_Set_MM_Blend_Func) TT_Set_MM_Blend, /* set_mm_blend */
523		- (FT_Get_MM_Blend_Func) TT_Get_MM_Blend, /* get_mm_blend */
524		- (FT_Get_MM_Var_Func) TT_Get_MM_Var, /* get_mm_var */
525		- (FT_Set_Var_Design_Func)TT_Set_Var_Design, /* set_var_design */
526		- (FT_Get_Var_Design_Func)TT_Get_Var_Design, /* get_var_design */
527		- (FT_Set_Named_Instance_Func)
528		- TT_Set_Named_Instance, /* set_named_instance */
529		- (FT_Get_Default_Named_Instance_Func)
530		- TT_Get_Default_Named_Instance,
531		- /* get_default_named_instance */
532		- (FT_Set_MM_WeightVector_Func)
533		- NULL, /* set_mm_weightvector */
534		- (FT_Get_MM_WeightVector_Func)
535		- NULL, /* get_mm_weightvector */
536		-
537		- (FT_Construct_PS_Name_Func)
538		- tt_construct_ps_name, /* construct_ps_name */
539		- (FT_Var_Load_Delta_Set_Idx_Map_Func)
540		- tt_var_load_delta_set_index_mapping,
541		- /* load_delta_set_idx_map */
542		- (FT_Var_Load_Item_Var_Store_Func)
543		- tt_var_load_item_variation_store,
544		- /* load_item_variation_store */
545		- (FT_Var_Get_Item_Delta_Func)
546		- tt_var_get_item_delta, /* get_item_delta */
547		- (FT_Var_Done_Item_Var_Store_Func)
548		- tt_var_done_item_variation_store,
549		- /* done_item_variation_store */
550		- (FT_Var_Done_Delta_Set_Idx_Map_Func)
551		- tt_var_done_delta_set_index_map,
552		- /* done_delta_set_index_map */
553		- (FT_Get_Var_Blend_Func) tt_get_var_blend, /* get_var_blend */
554		- (FT_Done_Blend_Func) tt_done_blend /* done_blend */
	520	+ NULL, /* FT_Get_MM_Func get_mm */
	521	+ NULL, /* FT_Set_MM_Design_Func set_mm_design */
	522	+ TT_Set_MM_Blend, /* FT_Set_MM_Blend_Func set_mm_blend */
	523	+ TT_Get_MM_Blend, /* FT_Get_MM_Blend_Func get_mm_blend */
	524	+ TT_Get_MM_Var, /* FT_Get_MM_Var_Func get_mm_var */
	525	+ TT_Set_Var_Design, /* FT_Set_Var_Design_Func set_var_design */
	526	+ TT_Get_Var_Design, /* FT_Get_Var_Design_Func get_var_design */
	527	+ TT_Set_Named_Instance, /* FT_Set_Named_Instance_Func set_named_instance */
	528	+ TT_Get_Default_Named_Instance,
	529	+ /* FT_Get_Default_Named_Instance_Func get_default_named_instance */
	530	+ NULL, /* FT_Set_MM_WeightVector_Func set_mm_weightvector */
	531	+ NULL, /* FT_Get_MM_WeightVector_Func get_mm_weightvector */
	532	+
	533	+ tt_construct_ps_name, /* FT_Construct_PS_Name_Func construct_ps_name */
	534	+ tt_var_load_delta_set_index_mapping,
	535	+ /* FT_Var_Load_Delta_Set_Idx_Map_Func load_delta_set_idx_map */
	536	+ tt_var_load_item_variation_store,
	537	+ /* FT_Var_Load_Item_Var_Store_Func load_item_variation_store */
	538	+ tt_var_get_item_delta, /* FT_Var_Get_Item_Delta_Func get_item_delta */
	539	+ tt_var_done_item_variation_store,
	540	+ /* FT_Var_Done_Item_Var_Store_Func done_item_variation_store */
	541	+ tt_var_done_delta_set_index_map,
	542	+ /* FT_Var_Done_Delta_Set_Idx_Map_Func done_delta_set_index_map */
	543	+ tt_get_var_blend, /* FT_Get_Var_Blend_Func get_var_blend */
	544	+ tt_done_blend /* FT_Done_Blend_Func done_blend */
555	545	)
556	546
557	547	FT_DEFINE_SERVICE_METRICSVARIATIONSREC(
558	548	tt_service_metrics_variations,
559	549
560		- (FT_HAdvance_Adjust_Func)tt_hadvance_adjust, /* hadvance_adjust */
561		- (FT_LSB_Adjust_Func) NULL, /* lsb_adjust */
562		- (FT_RSB_Adjust_Func) NULL, /* rsb_adjust */
	550	+ tt_hadvance_adjust, /* FT_HAdvance_Adjust_Func hadvance_adjust */
	551	+ NULL, /* FT_LSB_Adjust_Func lsb_adjust */
	552	+ NULL, /* FT_RSB_Adjust_Func rsb_adjust */
563	553
564		- (FT_VAdvance_Adjust_Func)tt_vadvance_adjust, /* vadvance_adjust */
565		- (FT_TSB_Adjust_Func) NULL, /* tsb_adjust */
566		- (FT_BSB_Adjust_Func) NULL, /* bsb_adjust */
567		- (FT_VOrg_Adjust_Func) NULL, /* vorg_adjust */
	554	+ tt_vadvance_adjust, /* FT_VAdvance_Adjust_Func vadvance_adjust */
	555	+ NULL, /* FT_TSB_Adjust_Func tsb_adjust */
	556	+ NULL, /* FT_BSB_Adjust_Func bsb_adjust */
	557	+ NULL, /* FT_VOrg_Adjust_Func vorg_adjust */
568	558
569		- (FT_Metrics_Adjust_Func) tt_apply_mvar, /* metrics_adjust */
570		- (FT_Size_Reset_Func) tt_size_reset_height /* size_reset */
	559	+ tt_apply_mvar, /* FT_Metrics_Adjust_Func metrics_adjust */
	560	+ tt_size_reset_height /* FT_Size_Reset_Func size_reset */
571	561	)
572	562
573	563	#endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */

src/type1/t1driver.c

---

...	...	@@ -94,8 +94,8 @@
94	94
95	95	static const FT_Service_GlyphDictRec t1_service_glyph_dict =
96	96	{
97		- (FT_GlyphDict_GetNameFunc) t1_get_glyph_name, /* get_name */
98		- (FT_GlyphDict_NameIndexFunc)t1_get_name_index /* name_index */
	97	+ t1_get_glyph_name, /* FT_GlyphDict_GetNameFunc get_name */
	98	+ t1_get_name_index /* FT_GlyphDict_NameIndexFunc name_index */
99	99	};
100	100
101	101
...	...	@@ -128,36 +128,28 @@
128	128	#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
129	129	static const FT_Service_MultiMastersRec t1_service_multi_masters =
130	130	{
131		- (FT_Get_MM_Func) T1_Get_Multi_Master, /* get_mm */
132		- (FT_Set_MM_Design_Func) T1_Set_MM_Design, /* set_mm_design */
133		- (FT_Set_MM_Blend_Func) T1_Set_MM_Blend, /* set_mm_blend */
134		- (FT_Get_MM_Blend_Func) T1_Get_MM_Blend, /* get_mm_blend */
135		- (FT_Get_MM_Var_Func) T1_Get_MM_Var, /* get_mm_var */
136		- (FT_Set_Var_Design_Func)T1_Set_Var_Design, /* set_var_design */
137		- (FT_Get_Var_Design_Func)T1_Get_Var_Design, /* get_var_design */
138		- (FT_Set_Named_Instance_Func)
139		- T1_Reset_MM_Blend, /* set_named_instance */
140		- (FT_Get_Default_Named_Instance_Func)
141		- NULL, /* get_default_named_instance */
142		- (FT_Set_MM_WeightVector_Func)
143		- T1_Set_MM_WeightVector, /* set_mm_weightvector */
144		- (FT_Get_MM_WeightVector_Func)
145		- T1_Get_MM_WeightVector, /* get_mm_weightvector */
146		-
147		- (FT_Construct_PS_Name_Func)
148		- NULL, /* construct_ps_name */
149		- (FT_Var_Load_Delta_Set_Idx_Map_Func)
150		- NULL, /* load_delta_set_idx_map */
151		- (FT_Var_Load_Item_Var_Store_Func)
152		- NULL, /* load_item_variation_store */
153		- (FT_Var_Get_Item_Delta_Func)
154		- NULL, /* get_item_delta */
155		- (FT_Var_Done_Item_Var_Store_Func)
156		- NULL, /* done_item_variation_store */
157		- (FT_Var_Done_Delta_Set_Idx_Map_Func)
158		- NULL, /* done_delta_set_index_map */
159		- (FT_Get_Var_Blend_Func) NULL, /* get_var_blend */
160		- (FT_Done_Blend_Func) T1_Done_Blend /* done_blend */
	131	+ T1_Get_Multi_Master, /* FT_Get_MM_Func get_mm */
	132	+ T1_Set_MM_Design, /* FT_Set_MM_Design_Func set_mm_design */
	133	+ T1_Set_MM_Blend, /* FT_Set_MM_Blend_Func set_mm_blend */
	134	+ T1_Get_MM_Blend, /* FT_Get_MM_Blend_Func get_mm_blend */
	135	+ T1_Get_MM_Var, /* FT_Get_MM_Var_Func get_mm_var */
	136	+ T1_Set_Var_Design, /* FT_Set_Var_Design_Func set_var_design */
	137	+ T1_Get_Var_Design, /* FT_Get_Var_Design_Func get_var_design */
	138	+ T1_Reset_MM_Blend, /* FT_Set_Named_Instance_Func set_named_instance */
	139	+ NULL, /* FT_Get_Default_Named_Instance_Func get_default_named_instance */
	140	+ T1_Set_MM_WeightVector,
	141	+ /* FT_Set_MM_WeightVector_Func set_mm_weightvector */
	142	+ T1_Get_MM_WeightVector,
	143	+ /* FT_Get_MM_WeightVector_Func get_mm_weightvector */
	144	+
	145	+ NULL, /* FT_Construct_PS_Name_Func construct_ps_name */
	146	+ NULL, /* FT_Var_Load_Delta_Set_Idx_Map_Func load_delta_set_idx_map */
	147	+ NULL, /* FT_Var_Load_Item_Var_Store_Func load_item_variation_store */
	148	+ NULL, /* FT_Var_Get_Item_Delta_Func get_item_delta */
	149	+ NULL, /* FT_Var_Done_Item_Var_Store_Func done_item_variation_store */
	150	+ NULL, /* FT_Var_Done_Delta_Set_Idx_Map_Func done_delta_set_index_map */
	151	+ NULL, /* FT_Get_Var_Blend_Func get_var_blend */
	152	+ T1_Done_Blend /* FT_Done_Blend_Func done_blend */
161	153	};
162	154	#endif
163	155
...	...	@@ -645,11 +637,11 @@
645	637
646	638	static const FT_Service_PsInfoRec t1_service_ps_info =
647	639	{
648		- (PS_GetFontInfoFunc) t1_ps_get_font_info, /* ps_get_font_info */
649		- (PS_GetFontExtraFunc) t1_ps_get_font_extra, /* ps_get_font_extra */
650		- (PS_HasGlyphNamesFunc) t1_ps_has_glyph_names, /* ps_has_glyph_names */
651		- (PS_GetFontPrivateFunc)t1_ps_get_font_private, /* ps_get_font_private */
652		- (PS_GetFontValueFunc) t1_ps_get_font_value, /* ps_get_font_value */
	640	+ t1_ps_get_font_info, /* PS_GetFontInfoFunc ps_get_font_info */
	641	+ t1_ps_get_font_extra, /* PS_GetFontExtraFunc ps_get_font_extra */
	642	+ t1_ps_has_glyph_names, /* PS_HasGlyphNamesFunc ps_has_glyph_names */
	643	+ t1_ps_get_font_private, /* PS_GetFontPrivateFunc ps_get_font_private */
	644	+ t1_ps_get_font_value, /* PS_GetFontValueFunc ps_get_font_value */
653	645	};
654	646
655	647
...	...	@@ -669,9 +661,9 @@
669	661	FT_DEFINE_SERVICE_PROPERTIESREC(
670	662	t1_service_properties,
671	663
672		- (FT_Properties_SetFunc)ps_property_set, /* set_property */
673		- (FT_Properties_GetFunc)ps_property_get ) /* get_property */
674		-
	664	+ ps_property_set, /* FT_Properties_SetFunc set_property */
	665	+ ps_property_get /* FT_Properties_GetFunc get_property */
	666	+ )
675	667
676	668	/*
677	669	* SERVICE LIST

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help