Chiebot-Mirror
/
freetype
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s/0/NULL/ for function pointers; comments, formatting.

Browse Source
Harmony
Werner Lemberg 9 years ago
parent d5f7533e8e
commit c95b7652d8
38 changed files with 562 additions and 436 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      include/freetype/ftimage.h
  2. 1
      include/freetype/ftrender.h
  3. 1
      include/freetype/internal/ftobjs.h
  4. 24
      src/autofit/afcjk.c
  5. 12
      src/autofit/afdummy.c
  6. 24
      src/autofit/afindic.c
  7. 12
      src/autofit/aflatin.c
  8. 12
      src/autofit/aflatin2.c
  9. 10
      src/autofit/afmodule.c
  10. 26
      src/base/ftbbox.c
  11. 32
      src/base/ftglyph.c
  12. 20
      src/bdf/bdfdrivr.c
  13. 51
      src/cache/ftcbasic.c
  14. 14
      src/cache/ftccmap.c
  15. 17
      src/cache/ftcmanag.c
  16. 2
      src/cache/ftcmru.h
  17. 37
      src/cff/cffcmap.c
  18. 12
      src/cff/cffdrivr.c
  19. 10
      src/cid/cidriver.c
  20. 8
      src/gxvalid/gxvmod.c
  21. 8
      src/otvalid/otvmod.c
  22. 20
      src/pcf/pcfdrivr.c
  23. 16
      src/pfr/pfrcmap.c
  24. 18
      src/pfr/pfrdrivr.c
  25. 72
      src/psaux/psauxmod.c
  26. 58
      src/psaux/t1cmap.c
  27. 12
      src/pshinter/pshmod.c
  28. 17
      src/psnames/psmodule.c
  29. 11
      src/raster/ftraster.c
  30. 22
      src/raster/ftrend1.c
  31. 33
      src/sfnt/sfdriver.c
  32. 237
      src/sfnt/ttcmap.c
  33. 25
      src/smooth/ftgrays.c
  34. 67
      src/smooth/ftsmooth.c
  35. 20
      src/truetype/ttdriver.c
  36. 8
      src/type1/t1driver.c
  37. 8
      src/type42/t42drivr.c
  38. 20
      src/winfonts/winfnt.c

1
include/freetype/ftimage.h
Unescape View File

@ -1180,6 +1180,7 @@ FT_BEGIN_HEADER
typedef struct FT_Raster_Funcs_
{
FT_Glyph_Format glyph_format;
FT_Raster_NewFunc raster_new;
FT_Raster_ResetFunc raster_reset;
FT_Raster_SetModeFunc raster_set_mode;

1
include/freetype/ftrender.h
Unescape View File

@ -75,6 +75,7 @@ FT_BEGIN_HEADER
{
FT_Long glyph_size;
FT_Glyph_Format glyph_format;
FT_Glyph_InitFunc glyph_init;
FT_Glyph_DoneFunc glyph_done;
FT_Glyph_CopyFunc glyph_copy;

1
include/freetype/internal/ftobjs.h
Unescape View File

@ -193,6 +193,7 @@ FT_BEGIN_HEADER
typedef struct FT_CMap_ClassRec_
{
FT_ULong size;
FT_CMap_InitFunc init;
FT_CMap_DoneFunc done;
FT_CMap_CharIndexFunc char_index;

24
src/autofit/afcjk.c
Unescape View File

@ -2351,13 +2351,13 @@
sizeof ( AF_CJKMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) af_cjk_metrics_init,
(AF_WritingSystem_ScaleMetricsFunc)af_cjk_metrics_scale,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)af_cjk_get_standard_widths,
(AF_WritingSystem_InitMetricsFunc) af_cjk_metrics_init, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)af_cjk_metrics_scale, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)af_cjk_get_standard_widths, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) af_cjk_hints_init,
(AF_WritingSystem_ApplyHintsFunc) af_cjk_hints_apply
(AF_WritingSystem_InitHintsFunc) af_cjk_hints_init, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) af_cjk_hints_apply /* style_hints_apply */
)
@ -2371,13 +2371,13 @@
sizeof ( AF_CJKMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) NULL,
(AF_WritingSystem_ScaleMetricsFunc)NULL,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)NULL,
(AF_WritingSystem_InitMetricsFunc) NULL, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)NULL, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)NULL, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) NULL,
(AF_WritingSystem_ApplyHintsFunc) NULL
(AF_WritingSystem_InitHintsFunc) NULL, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) NULL /* style_hints_apply */
)

12
src/autofit/afdummy.c
Unescape View File

@ -62,13 +62,13 @@
sizeof ( AF_StyleMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) NULL,
(AF_WritingSystem_ScaleMetricsFunc)NULL,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)NULL,
(AF_WritingSystem_InitMetricsFunc) NULL, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)NULL, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)NULL, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) af_dummy_hints_init,
(AF_WritingSystem_ApplyHintsFunc) af_dummy_hints_apply
(AF_WritingSystem_InitHintsFunc) af_dummy_hints_init, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) af_dummy_hints_apply /* style_hints_apply */
)

24
src/autofit/afindic.c
Unescape View File

@ -121,13 +121,13 @@
sizeof ( AF_CJKMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) af_indic_metrics_init,
(AF_WritingSystem_ScaleMetricsFunc)af_indic_metrics_scale,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)af_indic_get_standard_widths,
(AF_WritingSystem_InitMetricsFunc) af_indic_metrics_init, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)af_indic_metrics_scale, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)af_indic_get_standard_widths, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) af_indic_hints_init,
(AF_WritingSystem_ApplyHintsFunc) af_indic_hints_apply
(AF_WritingSystem_InitHintsFunc) af_indic_hints_init, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) af_indic_hints_apply /* style_hints_apply */
)
@ -141,13 +141,13 @@
sizeof ( AF_CJKMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) NULL,
(AF_WritingSystem_ScaleMetricsFunc)NULL,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)NULL,
(AF_WritingSystem_InitMetricsFunc) NULL, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)NULL, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)NULL, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) NULL,
(AF_WritingSystem_ApplyHintsFunc) NULL
(AF_WritingSystem_InitHintsFunc) NULL, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) NULL /* style_hints_apply */
)

12
src/autofit/aflatin.c
Unescape View File

@ -3477,13 +3477,13 @@
sizeof ( AF_LatinMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) af_latin_metrics_init,
(AF_WritingSystem_ScaleMetricsFunc)af_latin_metrics_scale,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)af_latin_get_standard_widths,
(AF_WritingSystem_InitMetricsFunc) af_latin_metrics_init, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)af_latin_metrics_scale, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)af_latin_get_standard_widths, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) af_latin_hints_init,
(AF_WritingSystem_ApplyHintsFunc) af_latin_hints_apply
(AF_WritingSystem_InitHintsFunc) af_latin_hints_init, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) af_latin_hints_apply /* style_hints_apply */
)

12
src/autofit/aflatin2.c
Unescape View File

@ -2410,13 +2410,13 @@
sizeof ( AF_LatinMetricsRec ),
(AF_WritingSystem_InitMetricsFunc) af_latin2_metrics_init,
(AF_WritingSystem_ScaleMetricsFunc)af_latin2_metrics_scale,
(AF_WritingSystem_DoneMetricsFunc) NULL,
(AF_WritingSystem_GetStdWidthsFunc)af_latin2_get_standard_widths,
(AF_WritingSystem_InitMetricsFunc) af_latin2_metrics_init, /* style_metrics_init */
(AF_WritingSystem_ScaleMetricsFunc)af_latin2_metrics_scale, /* style_metrics_scale */
(AF_WritingSystem_DoneMetricsFunc) NULL, /* style_metrics_done */
(AF_WritingSystem_GetStdWidthsFunc)af_latin2_get_standard_widths, /* style_metrics_getstdw */
(AF_WritingSystem_InitHintsFunc) af_latin2_hints_init,
(AF_WritingSystem_ApplyHintsFunc) af_latin2_hints_apply
(AF_WritingSystem_InitHintsFunc) af_latin2_hints_init, /* style_hints_init */
(AF_WritingSystem_ApplyHintsFunc) af_latin2_hints_apply /* style_hints_apply */
)

10
src/autofit/afmodule.c
Unescape View File

@ -421,12 +421,14 @@
FT_DEFINE_SERVICE_PROPERTIESREC(
af_service_properties,
(FT_Properties_SetFunc)af_property_set, /* set_property */
(FT_Properties_GetFunc)af_property_get ) /* get_property */
FT_DEFINE_SERVICEDESCREC1(
af_services,
FT_SERVICE_ID_PROPERTIES, &AF_SERVICE_PROPERTIES_GET )
@ -552,6 +554,7 @@
FT_DEFINE_AUTOHINTER_INTERFACE(
af_autofitter_interface,
NULL, /* reset_face */
NULL, /* get_global_hints */
NULL, /* done_global_hints */
@ -570,9 +573,10 @@
(const void*)&AF_INTERFACE_GET,
(FT_Module_Constructor)af_autofitter_init,
(FT_Module_Destructor) af_autofitter_done,
(FT_Module_Requester) af_get_interface )
(FT_Module_Constructor)af_autofitter_init, /* module_init */
(FT_Module_Destructor) af_autofitter_done, /* module_done */
(FT_Module_Requester) af_get_interface /* get_interface */
)
/* END */

26
src/base/ftbbox.c
Unescape View File

@ -423,12 +423,15 @@
}
FT_DEFINE_OUTLINE_FUNCS(bbox_interface,
(FT_Outline_MoveTo_Func) BBox_Move_To,
(FT_Outline_LineTo_Func) BBox_Line_To,
(FT_Outline_ConicTo_Func)BBox_Conic_To,
(FT_Outline_CubicTo_Func)BBox_Cubic_To,
0, 0
FT_DEFINE_OUTLINE_FUNCS(
bbox_interface,
(FT_Outline_MoveTo_Func) BBox_Move_To, /* move_to */
(FT_Outline_LineTo_Func) BBox_Line_To, /* line_to */
(FT_Outline_ConicTo_Func)BBox_Conic_To, /* conic_to */
(FT_Outline_CubicTo_Func)BBox_Cubic_To, /* cubic_to */
0, /* shift */
0 /* delta */
)
@ -457,6 +460,7 @@
{
abbox->xMin = abbox->xMax = 0;
abbox->yMin = abbox->yMax = 0;
return 0;
}
@ -468,10 +472,10 @@
for ( n = 0; n < outline->n_points; n++ )
{
FT_UPDATE_BBOX( vec, cbox);
FT_UPDATE_BBOX( vec, cbox );
if ( FT_CURVE_TAG( outline->tags[n] ) == FT_CURVE_TAG_ON )
FT_UPDATE_BBOX( vec, bbox);
FT_UPDATE_BBOX( vec, bbox );
vec++;
}
@ -487,8 +491,10 @@
TBBox_Rec user;
#ifdef FT_CONFIG_OPTION_PIC
FT_Outline_Funcs bbox_interface;
Init_Class_bbox_interface(&bbox_interface);
FT_Outline_Funcs bbox_interface;
Init_Class_bbox_interface( &bbox_interface );
#endif
user.bbox = bbox;

32
src/base/ftglyph.c
Unescape View File

@ -132,16 +132,18 @@
}
FT_DEFINE_GLYPH(ft_bitmap_glyph_class,
FT_DEFINE_GLYPH(
ft_bitmap_glyph_class,
sizeof ( FT_BitmapGlyphRec ),
FT_GLYPH_FORMAT_BITMAP,
ft_bitmap_glyph_init,
ft_bitmap_glyph_done,
ft_bitmap_glyph_copy,
0, /* FT_Glyph_TransformFunc */
ft_bitmap_glyph_bbox,
0 /* FT_Glyph_PrepareFunc */
ft_bitmap_glyph_init, /* FT_Glyph_InitFunc glyph_init */
ft_bitmap_glyph_done, /* FT_Glyph_DoneFunc glyph_done */
ft_bitmap_glyph_copy, /* FT_Glyph_CopyFunc glyph_copy */
NULL, /* FT_Glyph_TransformFunc glyph_transform */
ft_bitmap_glyph_bbox, /* FT_Glyph_GetBBoxFunc glyph_bbox */
NULL /* FT_Glyph_PrepareFunc glyph_prepare */
)
@ -260,16 +262,18 @@
}
FT_DEFINE_GLYPH( ft_outline_glyph_class,
FT_DEFINE_GLYPH(
ft_outline_glyph_class,
sizeof ( FT_OutlineGlyphRec ),
FT_GLYPH_FORMAT_OUTLINE,
ft_outline_glyph_init,
ft_outline_glyph_done,
ft_outline_glyph_copy,
ft_outline_glyph_transform,
ft_outline_glyph_bbox,
ft_outline_glyph_prepare
ft_outline_glyph_init, /* FT_Glyph_InitFunc glyph_init */
ft_outline_glyph_done, /* FT_Glyph_DoneFunc glyph_done */
ft_outline_glyph_copy, /* FT_Glyph_CopyFunc glyph_copy */
ft_outline_glyph_transform, /* FT_Glyph_TransformFunc glyph_transform */
ft_outline_glyph_bbox, /* FT_Glyph_GetBBoxFunc glyph_bbox */
ft_outline_glyph_prepare /* FT_Glyph_PrepareFunc glyph_prepare */
)

20
src/bdf/bdfdrivr.c
Unescape View File

@ -866,10 +866,10 @@ THE SOFTWARE.
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
0, /* FT_Module_Constructor module_init */
0, /* FT_Module_Destructor module_done */
NULL, /* FT_Module_Constructor module_init */
NULL, /* FT_Module_Destructor module_done */
bdf_driver_requester /* FT_Module_Requester get_interface */
},
@ -879,16 +879,16 @@ THE SOFTWARE.
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 */
NULL, /* FT_Size_InitFunc init_size */
NULL, /* FT_Size_DoneFunc done_size */
NULL, /* FT_Slot_InitFunc init_slot */
NULL, /* FT_Slot_DoneFunc done_slot */
BDF_Glyph_Load, /* FT_Slot_LoadFunc load_glyph */
0, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
0, /* FT_Face_GetAdvancesFunc get_advances */
NULL, /* FT_Face_GetKerningFunc get_kerning */
NULL, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetAdvancesFunc get_advances */
BDF_Size_Request, /* FT_Size_RequestFunc request_size */
BDF_Size_Select /* FT_Size_SelectFunc select_size */

51
src/cache/ftcbasic.c vendored
Unescape View File

@ -237,12 +237,14 @@
{
{
sizeof ( FTC_BasicFamilyRec ),
ftc_basic_family_compare,
ftc_basic_family_init,
0, /* FTC_MruNode_ResetFunc */
0 /* FTC_MruNode_DoneFunc */
ftc_basic_family_compare, /* FTC_MruNode_CompareFunc node_compare */
ftc_basic_family_init, /* FTC_MruNode_InitFunc node_init */
NULL, /* FTC_MruNode_ResetFunc node_reset */
NULL /* FTC_MruNode_DoneFunc node_done */
},
ftc_basic_family_load_glyph
ftc_basic_family_load_glyph /* FTC_IFamily_LoadGlyphFunc family_load_glyph */
};
@ -250,16 +252,17 @@
const FTC_GCacheClassRec ftc_basic_image_cache_class =
{
{
ftc_inode_new,
ftc_inode_weight,
ftc_gnode_compare,
ftc_basic_gnode_compare_faceid,
ftc_inode_free,
ftc_inode_new, /* FTC_Node_NewFunc node_new */
ftc_inode_weight, /* FTC_Node_WeightFunc node_weight */
ftc_gnode_compare, /* FTC_Node_CompareFunc node_compare */
ftc_basic_gnode_compare_faceid, /* FTC_Node_CompareFunc node_remove_faceid */
ftc_inode_free, /* FTC_Node_FreeFunc node_free */
sizeof ( FTC_GCacheRec ),
ftc_gcache_init,
ftc_gcache_done
ftc_gcache_init, /* FTC_Cache_InitFunc cache_init */
ftc_gcache_done /* FTC_Cache_DoneFunc cache_done */
},
(FTC_MruListClass)&ftc_basic_image_family_class
};
@ -419,11 +422,12 @@
{
{
sizeof ( FTC_BasicFamilyRec ),
ftc_basic_family_compare,
ftc_basic_family_init,
0, /* FTC_MruNode_ResetFunc */
0 /* FTC_MruNode_DoneFunc */
ftc_basic_family_compare, /* FTC_MruNode_CompareFunc node_compare */
ftc_basic_family_init, /* FTC_MruNode_InitFunc node_init */
NULL, /* FTC_MruNode_ResetFunc node_reset */
NULL /* FTC_MruNode_DoneFunc node_done */
},
ftc_basic_family_get_count,
ftc_basic_family_load_bitmap
};
@ -433,16 +437,17 @@
const FTC_GCacheClassRec ftc_basic_sbit_cache_class =
{
{
ftc_snode_new,
ftc_snode_weight,
ftc_snode_compare,
ftc_basic_gnode_compare_faceid,
ftc_snode_free,
ftc_snode_new, /* FTC_Node_NewFunc node_new */
ftc_snode_weight, /* FTC_Node_WeightFunc node_weight */
ftc_snode_compare, /* FTC_Node_CompareFunc node_compare */
ftc_basic_gnode_compare_faceid, /* FTC_Node_CompareFunc node_remove_faceid */
ftc_snode_free, /* FTC_Node_FreeFunc node_free */
sizeof ( FTC_GCacheRec ),
ftc_gcache_init,
ftc_gcache_done
ftc_gcache_init, /* FTC_Cache_InitFunc cache_init */
ftc_gcache_done /* FTC_Cache_DoneFunc cache_done */
},
(FTC_MruListClass)&ftc_basic_sbit_family_class
};

14
src/cache/ftccmap.c vendored
Unescape View File

@ -201,15 +201,15 @@
static
const FTC_CacheClassRec ftc_cmap_cache_class =
{
ftc_cmap_node_new,
ftc_cmap_node_weight,
ftc_cmap_node_compare,
ftc_cmap_node_remove_faceid,
ftc_cmap_node_free,
ftc_cmap_node_new, /* FTC_Node_NewFunc node_new */
ftc_cmap_node_weight, /* FTC_Node_WeightFunc node_weight */
ftc_cmap_node_compare, /* FTC_Node_CompareFunc node_compare */
ftc_cmap_node_remove_faceid, /* FTC_Node_CompareFunc node_remove_faceid */
ftc_cmap_node_free, /* FTC_Node_FreeFunc node_free */
sizeof ( FTC_CacheRec ),
ftc_cache_init,
ftc_cache_done,
ftc_cache_init, /* FTC_Cache_InitFunc cache_init */
ftc_cache_done, /* FTC_Cache_DoneFunc cache_done */
};

17
src/cache/ftcmanag.c vendored
Unescape View File

@ -156,10 +156,11 @@
const FTC_MruListClassRec ftc_size_list_class =
{
sizeof ( FTC_SizeNodeRec ),
ftc_size_node_compare,
ftc_size_node_init,
ftc_size_node_reset,
ftc_size_node_done
ftc_size_node_compare, /* FTC_MruNode_CompareFunc node_compare */
ftc_size_node_init, /* FTC_MruNode_InitFunc node_init */
ftc_size_node_reset, /* FTC_MruNode_ResetFunc node_reset */
ftc_size_node_done /* FTC_MruNode_DoneFunc node_done */
};
@ -296,10 +297,10 @@
{
sizeof ( FTC_FaceNodeRec),
ftc_face_node_compare,
ftc_face_node_init,
0, /* FTC_MruNode_ResetFunc */
ftc_face_node_done
ftc_face_node_compare, /* FTC_MruNode_CompareFunc node_compare */
ftc_face_node_init, /* FTC_MruNode_InitFunc node_init */
NULL, /* FTC_MruNode_ResetFunc node_reset */
ftc_face_node_done /* FTC_MruNode_DoneFunc node_done */
};

2
src/cache/ftcmru.h vendored
Unescape View File

@ -108,6 +108,7 @@ FT_BEGIN_HEADER
typedef struct FTC_MruListClassRec_
{
FT_Offset node_size;
FTC_MruNode_CompareFunc node_compare;
FTC_MruNode_InitFunc node_init;
FTC_MruNode_ResetFunc node_reset;
@ -115,6 +116,7 @@ FT_BEGIN_HEADER
} FTC_MruListClassRec;
typedef struct FTC_MruListRec_
{
FT_UInt num_nodes;

37
src/cff/cffcmap.c
Unescape View File

@ -104,15 +104,21 @@
}
FT_DEFINE_CMAP_CLASS(cff_cmap_encoding_class_rec,
FT_DEFINE_CMAP_CLASS(
cff_cmap_encoding_class_rec,
sizeof ( CFF_CMapStdRec ),
(FT_CMap_InitFunc) cff_cmap_encoding_init,
(FT_CMap_DoneFunc) cff_cmap_encoding_done,
(FT_CMap_CharIndexFunc)cff_cmap_encoding_char_index,
(FT_CMap_CharNextFunc) cff_cmap_encoding_char_next,
(FT_CMap_InitFunc) cff_cmap_encoding_init, /* init */
(FT_CMap_DoneFunc) cff_cmap_encoding_done, /* done */
(FT_CMap_CharIndexFunc)cff_cmap_encoding_char_index, /* char_index */
(FT_CMap_CharNextFunc) cff_cmap_encoding_char_next, /* char_next */
NULL, NULL, NULL, NULL, NULL
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
)
@ -202,15 +208,22 @@
}
FT_DEFINE_CMAP_CLASS(cff_cmap_unicode_class_rec,
FT_DEFINE_CMAP_CLASS(
cff_cmap_unicode_class_rec,
sizeof ( PS_UnicodesRec ),
(FT_CMap_InitFunc) cff_cmap_unicode_init,
(FT_CMap_DoneFunc) cff_cmap_unicode_done,
(FT_CMap_CharIndexFunc)cff_cmap_unicode_char_index,
(FT_CMap_CharNextFunc) cff_cmap_unicode_char_next,
(FT_CMap_InitFunc) cff_cmap_unicode_init, /* init */
(FT_CMap_DoneFunc) cff_cmap_unicode_done, /* done */
(FT_CMap_CharIndexFunc)cff_cmap_unicode_char_index, /* char_index */
(FT_CMap_CharNextFunc) cff_cmap_unicode_char_next, /* char_next */
NULL, NULL, NULL, NULL, NULL
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
)
/* END */

12
src/cff/cffdrivr.c
Unescape View File

@ -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 */

10
src/cid/cidriver.c
Unescape View File

@ -206,7 +206,7 @@
0x10000L, /* version 1.0 of driver */
0x20000L, /* requires FreeType 2.0 */
0, /* module-specific interface */
NULL, /* module-specific interface */
cid_driver_init, /* FT_Module_Constructor module_init */
cid_driver_done, /* FT_Module_Destructor module_done */
@ -226,12 +226,12 @@
cid_slot_load_glyph, /* FT_Slot_LoadFunc load_glyph */
0, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
0, /* FT_Face_GetAdvancesFunc get_advances */
NULL, /* FT_Face_GetKerningFunc get_kerning */
NULL, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetAdvancesFunc get_advances */
cid_size_request, /* FT_Size_RequestFunc request_size */
0 /* FT_Size_SelectFunc select_size */
NULL /* FT_Size_SelectFunc select_size */
};

8
src/gxvalid/gxvmod.c
Unescape View File

@ -274,11 +274,11 @@
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
(FT_Module_Constructor)0,
(FT_Module_Destructor) 0,
(FT_Module_Requester) gxvalid_get_service
(FT_Module_Constructor)NULL, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) gxvalid_get_service /* get_interface */
};

8
src/otvalid/otvmod.c
Unescape View File

@ -271,11 +271,11 @@
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
(FT_Module_Constructor)0,
(FT_Module_Destructor) 0,
(FT_Module_Requester) otvalid_get_service
(FT_Module_Constructor)NULL, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) otvalid_get_service /* get_interface */
};

20
src/pcf/pcfdrivr.c
Unescape View File

@ -700,10 +700,10 @@ THE SOFTWARE.
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
0, /* FT_Module_Constructor module_init */
0, /* FT_Module_Destructor module_done */
NULL, /* FT_Module_Constructor module_init */
NULL, /* FT_Module_Destructor module_done */
pcf_driver_requester /* FT_Module_Requester get_interface */
},
@ -713,16 +713,16 @@ THE SOFTWARE.
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 */
NULL, /* FT_Size_InitFunc init_size */
NULL, /* FT_Size_DoneFunc done_size */
NULL, /* FT_Slot_InitFunc init_slot */
NULL, /* FT_Slot_DoneFunc done_slot */
PCF_Glyph_Load, /* FT_Slot_LoadFunc load_glyph */
0, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
0, /* FT_Face_GetAdvancesFunc get_advances */
NULL, /* FT_Face_GetKerningFunc get_kerning */
NULL, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetAdvancesFunc get_advances */
PCF_Size_Request, /* FT_Size_RequestFunc request_size */
PCF_Size_Select /* FT_Size_SelectFunc select_size */

16
src/pfr/pfrcmap.c
Unescape View File

@ -161,12 +161,16 @@
{
sizeof ( PFR_CMapRec ),
(FT_CMap_InitFunc) pfr_cmap_init,
(FT_CMap_DoneFunc) pfr_cmap_done,
(FT_CMap_CharIndexFunc)pfr_cmap_char_index,
(FT_CMap_CharNextFunc) pfr_cmap_char_next,
NULL, NULL, NULL, NULL, NULL
(FT_CMap_InitFunc) pfr_cmap_init, /* init */
(FT_CMap_DoneFunc) pfr_cmap_done, /* done */
(FT_CMap_CharIndexFunc)pfr_cmap_char_index, /* char_index */
(FT_CMap_CharNextFunc) pfr_cmap_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
};

18
src/pfr/pfrdrivr.c
Unescape View File

@ -181,10 +181,10 @@
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
0, /* FT_Module_Constructor module_init */
0, /* FT_Module_Destructor module_done */
NULL, /* FT_Module_Constructor module_init */
NULL, /* FT_Module_Destructor module_done */
pfr_get_service /* FT_Module_Requester get_interface */
},
@ -194,19 +194,19 @@
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 */
NULL, /* FT_Size_InitFunc init_size */
NULL, /* FT_Size_DoneFunc done_size */
pfr_slot_init, /* FT_Slot_InitFunc init_slot */
pfr_slot_done, /* FT_Slot_DoneFunc done_slot */
pfr_slot_load, /* FT_Slot_LoadFunc load_glyph */
pfr_get_kerning, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
0, /* FT_Face_GetAdvancesFunc get_advances */
NULL, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetAdvancesFunc get_advances */
0, /* FT_Size_RequestFunc request_size */
0, /* FT_Size_SelectFunc select_size */
NULL, /* FT_Size_RequestFunc request_size */
NULL, /* FT_Size_SelectFunc select_size */
};

72
src/psaux/psauxmod.c
Unescape View File

@ -30,52 +30,56 @@
FT_CALLBACK_TABLE_DEF
const PS_Table_FuncsRec ps_table_funcs =
{
ps_table_new,
ps_table_done,
ps_table_add,
ps_table_release
ps_table_new, /* init */
ps_table_done, /* done */
ps_table_add, /* add */
ps_table_release /* release */
};
FT_CALLBACK_TABLE_DEF
const PS_Parser_FuncsRec ps_parser_funcs =
{
ps_parser_init,
ps_parser_done,
ps_parser_skip_spaces,
ps_parser_skip_PS_token,
ps_parser_to_int,
ps_parser_to_fixed,
ps_parser_to_bytes,
ps_parser_to_coord_array,
ps_parser_to_fixed_array,
ps_parser_to_token,
ps_parser_to_token_array,
ps_parser_load_field,
ps_parser_load_field_table
ps_parser_init, /* init */
ps_parser_done, /* done */
ps_parser_skip_spaces, /* skip_spaces */
ps_parser_skip_PS_token, /* skip_PS_token */
ps_parser_to_int, /* to_int */
ps_parser_to_fixed, /* to_fixed */
ps_parser_to_bytes, /* to_bytes */
ps_parser_to_coord_array, /* to_coord_array */
ps_parser_to_fixed_array, /* to_fixed_array */
ps_parser_to_token, /* to_token */
ps_parser_to_token_array, /* to_token_array */
ps_parser_load_field, /* load_field */
ps_parser_load_field_table /* load_field_table */
};
FT_CALLBACK_TABLE_DEF
const T1_Builder_FuncsRec t1_builder_funcs =
{
t1_builder_init,
t1_builder_done,
t1_builder_check_points,
t1_builder_add_point,
t1_builder_add_point1,
t1_builder_add_contour,
t1_builder_start_point,
t1_builder_close_contour
t1_builder_init, /* init */
t1_builder_done, /* done */
t1_builder_check_points, /* check_points */
t1_builder_add_point, /* add_point */
t1_builder_add_point1, /* add_point1 */
t1_builder_add_contour, /* add_contour */
t1_builder_start_point, /* start_point */
t1_builder_close_contour /* close_contour */
};
FT_CALLBACK_TABLE_DEF
const T1_Decoder_FuncsRec t1_decoder_funcs =
{
t1_decoder_init,
t1_decoder_done,
t1_decoder_parse_charstrings
t1_decoder_init, /* init */
t1_decoder_done, /* done */
t1_decoder_parse_charstrings /* parse_charstrings */
};
@ -83,9 +87,9 @@
FT_CALLBACK_TABLE_DEF
const AFM_Parser_FuncsRec afm_parser_funcs =
{
afm_parser_init,
afm_parser_done,
afm_parser_parse
afm_parser_init, /* init */
afm_parser_done, /* done */
afm_parser_parse /* parse */
};
#endif
@ -130,9 +134,9 @@
&psaux_interface, /* module-specific interface */
(FT_Module_Constructor)0,
(FT_Module_Destructor) 0,
(FT_Module_Requester) 0
(FT_Module_Constructor)NULL, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) NULL /* get_interface */
};

58
src/psaux/t1cmap.c
Unescape View File

@ -136,12 +136,16 @@
{
sizeof ( T1_CMapStdRec ),
(FT_CMap_InitFunc) t1_cmap_standard_init,
(FT_CMap_DoneFunc) t1_cmap_std_done,
(FT_CMap_CharIndexFunc)t1_cmap_std_char_index,
(FT_CMap_CharNextFunc) t1_cmap_std_char_next,
NULL, NULL, NULL, NULL, NULL
(FT_CMap_InitFunc) t1_cmap_standard_init, /* init */
(FT_CMap_DoneFunc) t1_cmap_std_done, /* done */
(FT_CMap_CharIndexFunc)t1_cmap_std_char_index, /* char_index */
(FT_CMap_CharNextFunc) t1_cmap_std_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
};
@ -161,12 +165,16 @@
{
sizeof ( T1_CMapStdRec ),
(FT_CMap_InitFunc) t1_cmap_expert_init,
(FT_CMap_DoneFunc) t1_cmap_std_done,
(FT_CMap_CharIndexFunc)t1_cmap_std_char_index,
(FT_CMap_CharNextFunc) t1_cmap_std_char_next,
(FT_CMap_InitFunc) t1_cmap_expert_init, /* init */
(FT_CMap_DoneFunc) t1_cmap_std_done, /* done */
(FT_CMap_CharIndexFunc)t1_cmap_std_char_index, /* char_index */
(FT_CMap_CharNextFunc) t1_cmap_std_char_next, /* char_next */
NULL, NULL, NULL, NULL, NULL
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
};
@ -257,12 +265,16 @@
{
sizeof ( T1_CMapCustomRec ),
(FT_CMap_InitFunc) t1_cmap_custom_init,
(FT_CMap_DoneFunc) t1_cmap_custom_done,
(FT_CMap_CharIndexFunc)t1_cmap_custom_char_index,
(FT_CMap_CharNextFunc) t1_cmap_custom_char_next,
(FT_CMap_InitFunc) t1_cmap_custom_init, /* init */
(FT_CMap_DoneFunc) t1_cmap_custom_done, /* done */
(FT_CMap_CharIndexFunc)t1_cmap_custom_char_index, /* char_index */
(FT_CMap_CharNextFunc) t1_cmap_custom_char_next, /* char_next */
NULL, NULL, NULL, NULL, NULL
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
};
@ -343,12 +355,16 @@
{
sizeof ( PS_UnicodesRec ),
(FT_CMap_InitFunc) t1_cmap_unicode_init,
(FT_CMap_DoneFunc) t1_cmap_unicode_done,
(FT_CMap_CharIndexFunc)t1_cmap_unicode_char_index,
(FT_CMap_CharNextFunc) t1_cmap_unicode_char_next,
(FT_CMap_InitFunc) t1_cmap_unicode_init, /* init */
(FT_CMap_DoneFunc) t1_cmap_unicode_done, /* done */
(FT_CMap_CharIndexFunc)t1_cmap_unicode_char_index, /* char_index */
(FT_CMap_CharNextFunc) t1_cmap_unicode_char_next, /* char_next */
NULL, NULL, NULL, NULL, NULL
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
};

12
src/pshinter/pshmod.c
Unescape View File

@ -95,9 +95,11 @@
FT_DEFINE_PSHINTER_INTERFACE(
pshinter_interface,
pshinter_get_globals_funcs,
pshinter_get_t1_funcs,
pshinter_get_t2_funcs )
pshinter_get_t2_funcs
)
FT_DEFINE_MODULE(
@ -111,9 +113,9 @@
&PSHINTER_INTERFACE_GET, /* module-specific interface */
(FT_Module_Constructor)ps_hinter_init,
(FT_Module_Destructor) ps_hinter_done,
(FT_Module_Requester) NULL ) /* no additional interface for now */
(FT_Module_Constructor)ps_hinter_init, /* module_init */
(FT_Module_Destructor) ps_hinter_done, /* module_done */
(FT_Module_Requester) NULL /* get_interface */
)
/* END */

17
src/psnames/psmodule.c
Unescape View File

@ -525,6 +525,7 @@
FT_DEFINE_SERVICE_PSCMAPSREC(
pscmaps_interface,
(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 */
@ -534,12 +535,14 @@
(PS_Adobe_Std_StringsFunc) ps_get_standard_strings, /* adobe_std_strings */
t1_standard_encoding, /* adobe_std_encoding */
t1_expert_encoding ) /* adobe_expert_encoding */
t1_expert_encoding /* adobe_expert_encoding */
)
#else
FT_DEFINE_SERVICE_PSCMAPSREC(
pscmaps_interface,
NULL, /* unicode_value */
NULL, /* unicodes_init */
NULL, /* unicodes_char_index */
@ -549,13 +552,15 @@
(PS_Adobe_Std_StringsFunc) ps_get_standard_strings, /* adobe_std_strings */
t1_standard_encoding, /* adobe_std_encoding */
t1_expert_encoding ) /* adobe_expert_encoding */
t1_expert_encoding /* adobe_expert_encoding */
)
#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
FT_DEFINE_SERVICEDESCREC1(
pscmaps_services,
FT_SERVICE_ID_POSTSCRIPT_CMAPS, &PSCMAPS_INTERFACE_GET )
@ -601,9 +606,11 @@
PUT_PS_NAMES_SERVICE(
(void*)&PSCMAPS_INTERFACE_GET ), /* module specific interface */
(FT_Module_Constructor)NULL,
(FT_Module_Destructor) NULL,
(FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) )
(FT_Module_Constructor)NULL, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) /* get_interface */
)
/* END */

11
src/raster/ftraster.c
Unescape View File

@ -3208,11 +3208,12 @@
FT_GLYPH_FORMAT_OUTLINE,
(FT_Raster_New_Func) ft_black_new,
(FT_Raster_Reset_Func) ft_black_reset,
(FT_Raster_Set_Mode_Func)ft_black_set_mode,
(FT_Raster_Render_Func) ft_black_render,
(FT_Raster_Done_Func) ft_black_done )
(FT_Raster_New_Func) ft_black_new, /* raster_new */
(FT_Raster_Reset_Func) ft_black_reset, /* raster_reset */
(FT_Raster_Set_Mode_Func)ft_black_set_mode, /* raster_set_mode */
(FT_Raster_Render_Func) ft_black_render, /* raster_render */
(FT_Raster_Done_Func) ft_black_done /* raster_done */
)
/* END */

22
src/raster/ftrend1.c
Unescape View File

@ -224,7 +224,8 @@
}
FT_DEFINE_RENDERER( ft_raster1_renderer_class,
FT_DEFINE_RENDERER(
ft_raster1_renderer_class,
FT_MODULE_RENDERER,
sizeof ( FT_RendererRec ),
@ -233,21 +234,20 @@
0x10000L,
0x20000L,
0, /* module specific interface */
NULL, /* module specific interface */
(FT_Module_Constructor)ft_raster1_init,
(FT_Module_Destructor) 0,
(FT_Module_Requester) 0
,
(FT_Module_Constructor)ft_raster1_init, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) NULL, /* get_interface */
FT_GLYPH_FORMAT_OUTLINE,
(FT_Renderer_RenderFunc) ft_raster1_render,
(FT_Renderer_TransformFunc)ft_raster1_transform,
(FT_Renderer_GetCBoxFunc) ft_raster1_get_cbox,
(FT_Renderer_SetModeFunc) ft_raster1_set_mode,
(FT_Renderer_RenderFunc) ft_raster1_render, /* render_glyph */
(FT_Renderer_TransformFunc)ft_raster1_transform, /* transform_glyph */
(FT_Renderer_GetCBoxFunc) ft_raster1_get_cbox, /* get_glyph_cbox */
(FT_Renderer_SetModeFunc) ft_raster1_set_mode, /* set_mode */
(FT_Raster_Funcs*) &FT_STANDARD_RASTER_GET
(FT_Raster_Funcs*)&FT_STANDARD_RASTER_GET /* raster_class */
)

33
src/sfnt/sfdriver.c
Unescape View File

@ -139,9 +139,11 @@
FT_DEFINE_SERVICE_SFNT_TABLEREC(
sfnt_service_sfnt_table,
(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 */
(FT_SFNT_TableInfoFunc)sfnt_table_info /* table_info */
)
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
@ -205,9 +207,10 @@
FT_DEFINE_SERVICE_GLYPHDICTREC(
sfnt_service_glyph_dict,
(FT_GlyphDict_GetNameFunc) sfnt_get_glyph_name, /* get_name */
(FT_GlyphDict_NameIndexFunc)sfnt_get_name_index ) /* 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 +333,9 @@
FT_DEFINE_SERVICE_PSFONTNAMEREC(
sfnt_service_ps_name,
(FT_PsName_GetFunc)sfnt_get_ps_name ) /* get_ps_font_name */
(FT_PsName_GetFunc)sfnt_get_ps_name /* get_ps_font_name */
)
/*
@ -338,7 +343,9 @@
*/
FT_DEFINE_SERVICE_TTCMAPSREC(
tt_service_get_cmap_info,
(TT_CMap_Info_GetFunc)tt_get_cmap_info ) /* get_cmap_info */
(TT_CMap_Info_GetFunc)tt_get_cmap_info /* get_cmap_info */
)
#ifdef TT_CONFIG_OPTION_BDF
@ -381,8 +388,10 @@
FT_DEFINE_SERVICE_BDFRec(
sfnt_service_bdf,
(FT_BDF_GetCharsetIdFunc)sfnt_get_charset_id, /* get_charset_id */
(FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop ) /* get_property */
(FT_BDF_GetPropertyFunc) tt_face_find_bdf_prop /* get_property */
)
#endif /* TT_CONFIG_OPTION_BDF */
@ -395,6 +404,7 @@
#if defined TT_CONFIG_OPTION_POSTSCRIPT_NAMES && defined TT_CONFIG_OPTION_BDF
FT_DEFINE_SERVICEDESCREC5(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_GLYPH_DICT, &SFNT_SERVICE_GLYPH_DICT_GET,
@ -403,6 +413,7 @@
#elif defined TT_CONFIG_OPTION_POSTSCRIPT_NAMES
FT_DEFINE_SERVICEDESCREC4(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_GLYPH_DICT, &SFNT_SERVICE_GLYPH_DICT_GET,
@ -410,6 +421,7 @@
#elif defined TT_CONFIG_OPTION_BDF
FT_DEFINE_SERVICEDESCREC4(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_BDF, &SFNT_SERVICE_BDF_GET,
@ -417,6 +429,7 @@
#else
FT_DEFINE_SERVICEDESCREC3(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET )
@ -459,6 +472,7 @@
FT_DEFINE_SFNT_INTERFACE(
sfnt_interface,
tt_face_goto_table, /* TT_Loader_GotoTableFunc goto_table */
sfnt_init_face, /* TT_Init_Face_Func init_face */
@ -530,9 +544,10 @@
(const void*)&SFNT_INTERFACE_GET, /* module specific interface */
(FT_Module_Constructor)0,
(FT_Module_Destructor) 0,
(FT_Module_Requester) sfnt_get_interface )
(FT_Module_Constructor)NULL, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) sfnt_get_interface /* get_interface */
)
/* END */

237
src/sfnt/ttcmap.c
Unescape View File

@ -180,22 +180,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap0_class_rec,
sizeof ( TT_CMapRec ),
(FT_CMap_InitFunc) tt_cmap_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap0_char_index,
(FT_CMap_CharNextFunc) tt_cmap0_char_next,
sizeof ( TT_CMapRec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap0_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap0_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
0,
(TT_CMap_ValidateFunc)tt_cmap0_validate,
(TT_CMap_Info_GetFunc)tt_cmap0_get_info )
(TT_CMap_ValidateFunc)tt_cmap0_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap0_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_0 */
@ -571,22 +573,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap2_class_rec,
sizeof ( TT_CMapRec ),
(FT_CMap_InitFunc) tt_cmap_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap2_char_index,
(FT_CMap_CharNextFunc) tt_cmap2_char_next,
sizeof ( TT_CMapRec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap2_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap2_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
2,
(TT_CMap_ValidateFunc)tt_cmap2_validate,
(TT_CMap_Info_GetFunc)tt_cmap2_get_info )
(TT_CMap_ValidateFunc)tt_cmap2_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap2_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_2 */
@ -1516,21 +1520,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap4_class_rec,
sizeof ( TT_CMap4Rec ),
(FT_CMap_InitFunc) tt_cmap4_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap4_char_index,
(FT_CMap_CharNextFunc) tt_cmap4_char_next,
NULL,
NULL,
NULL,
NULL,
NULL,
sizeof ( TT_CMap4Rec ),
(FT_CMap_InitFunc) tt_cmap4_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap4_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap4_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
4,
(TT_CMap_ValidateFunc)tt_cmap4_validate,
(TT_CMap_Info_GetFunc)tt_cmap4_get_info )
(TT_CMap_ValidateFunc)tt_cmap4_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap4_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_4 */
@ -1683,22 +1690,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap6_class_rec,
sizeof ( TT_CMapRec ),
(FT_CMap_InitFunc) tt_cmap_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap6_char_index,
(FT_CMap_CharNextFunc) tt_cmap6_char_next,
sizeof ( TT_CMapRec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap6_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap6_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
6,
(TT_CMap_ValidateFunc)tt_cmap6_validate,
(TT_CMap_Info_GetFunc)tt_cmap6_get_info )
(TT_CMap_ValidateFunc)tt_cmap6_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap6_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_6 */
@ -1975,22 +1984,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap8_class_rec,
sizeof ( TT_CMapRec ),
(FT_CMap_InitFunc) tt_cmap_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap8_char_index,
(FT_CMap_CharNextFunc) tt_cmap8_char_next,
sizeof ( TT_CMapRec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap8_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap8_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
8,
(TT_CMap_ValidateFunc)tt_cmap8_validate,
(TT_CMap_Info_GetFunc)tt_cmap8_get_info )
(TT_CMap_ValidateFunc)tt_cmap8_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap8_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_8 */
@ -2145,22 +2156,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap10_class_rec,
sizeof ( TT_CMapRec ),
(FT_CMap_InitFunc) tt_cmap_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap10_char_index,
(FT_CMap_CharNextFunc) tt_cmap10_char_next,
sizeof ( TT_CMapRec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap10_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap10_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
10,
(TT_CMap_ValidateFunc)tt_cmap10_validate,
(TT_CMap_Info_GetFunc)tt_cmap10_get_info )
(TT_CMap_ValidateFunc)tt_cmap10_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap10_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_10 */
@ -2499,22 +2512,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap12_class_rec,
sizeof ( TT_CMap12Rec ),
(FT_CMap_InitFunc) tt_cmap12_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap12_char_index,
(FT_CMap_CharNextFunc) tt_cmap12_char_next,
sizeof ( TT_CMap12Rec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap12_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap12_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap12_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
12,
(TT_CMap_ValidateFunc)tt_cmap12_validate,
(TT_CMap_Info_GetFunc)tt_cmap12_get_info )
(TT_CMap_ValidateFunc)tt_cmap12_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap12_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_12 */
@ -2823,22 +2838,24 @@
FT_DEFINE_TT_CMAP(
tt_cmap13_class_rec,
sizeof ( TT_CMap13Rec ),
(FT_CMap_InitFunc) tt_cmap13_init,
(FT_CMap_DoneFunc) NULL,
(FT_CMap_CharIndexFunc)tt_cmap13_char_index,
(FT_CMap_CharNextFunc) tt_cmap13_char_next,
sizeof ( TT_CMap13Rec ),
NULL,
NULL,
NULL,
NULL,
NULL,
(FT_CMap_InitFunc) tt_cmap13_init, /* init */
(FT_CMap_DoneFunc) NULL, /* done */
(FT_CMap_CharIndexFunc)tt_cmap13_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap13_char_next, /* char_next */
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL, /* variantchar_list */
13,
(TT_CMap_ValidateFunc)tt_cmap13_validate,
(TT_CMap_Info_GetFunc)tt_cmap13_get_info )
(TT_CMap_ValidateFunc)tt_cmap13_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap13_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_13 */
@ -3582,23 +3599,25 @@
FT_DEFINE_TT_CMAP(
tt_cmap14_class_rec,
sizeof ( TT_CMap14Rec ),
(FT_CMap_InitFunc) tt_cmap14_init,
(FT_CMap_DoneFunc) tt_cmap14_done,
(FT_CMap_CharIndexFunc)tt_cmap14_char_index,
(FT_CMap_CharNextFunc) tt_cmap14_char_next,
sizeof ( TT_CMap14Rec ),
(FT_CMap_InitFunc) tt_cmap14_init, /* init */
(FT_CMap_DoneFunc) tt_cmap14_done, /* done */
(FT_CMap_CharIndexFunc)tt_cmap14_char_index, /* char_index */
(FT_CMap_CharNextFunc) tt_cmap14_char_next, /* char_next */
/* Format 14 extension functions */
(FT_CMap_CharVarIndexFunc) tt_cmap14_char_var_index,
(FT_CMap_CharVarIsDefaultFunc)tt_cmap14_char_var_isdefault,
(FT_CMap_VariantListFunc) tt_cmap14_variants,
(FT_CMap_CharVariantListFunc) tt_cmap14_char_variants,
(FT_CMap_VariantCharListFunc) tt_cmap14_variant_chars,
/* Format 14 extension functions */
(FT_CMap_CharVarIndexFunc) tt_cmap14_char_var_index,
(FT_CMap_CharVarIsDefaultFunc)tt_cmap14_char_var_isdefault,
(FT_CMap_VariantListFunc) tt_cmap14_variants,
(FT_CMap_CharVariantListFunc) tt_cmap14_char_variants,
(FT_CMap_VariantCharListFunc) tt_cmap14_variant_chars,
14,
(TT_CMap_ValidateFunc)tt_cmap14_validate,
(TT_CMap_Info_GetFunc)tt_cmap14_get_info )
(TT_CMap_ValidateFunc)tt_cmap14_validate, /* validate */
(TT_CMap_Info_GetFunc)tt_cmap14_get_info /* get_cmap_info */
)
#endif /* TT_CONFIG_CMAP_FORMAT_14 */

25
src/smooth/ftgrays.c
Unescape View File

@ -1697,12 +1697,14 @@ typedef ptrdiff_t FT_PtrDist;
FT_DEFINE_OUTLINE_FUNCS(
func_interface,
(FT_Outline_MoveTo_Func) gray_move_to,
(FT_Outline_LineTo_Func) gray_line_to,
(FT_Outline_ConicTo_Func)gray_conic_to,
(FT_Outline_CubicTo_Func)gray_cubic_to,
0,
0 )
(FT_Outline_MoveTo_Func) gray_move_to, /* move_to */
(FT_Outline_LineTo_Func) gray_line_to, /* line_to */
(FT_Outline_ConicTo_Func)gray_conic_to, /* conic_to */
(FT_Outline_CubicTo_Func)gray_cubic_to, /* cubic_to */
0, /* shift */
0 /* delta */
)
static int
@ -2039,11 +2041,12 @@ typedef ptrdiff_t FT_PtrDist;
FT_GLYPH_FORMAT_OUTLINE,
(FT_Raster_New_Func) gray_raster_new,
(FT_Raster_Reset_Func) gray_raster_reset,
(FT_Raster_Set_Mode_Func)gray_raster_set_mode,
(FT_Raster_Render_Func) gray_raster_render,
(FT_Raster_Done_Func) gray_raster_done )
(FT_Raster_New_Func) gray_raster_new, /* raster_new */
(FT_Raster_Reset_Func) gray_raster_reset, /* raster_reset */
(FT_Raster_Set_Mode_Func)gray_raster_set_mode, /* raster_set_mode */
(FT_Raster_Render_Func) gray_raster_render, /* raster_render */
(FT_Raster_Done_Func) gray_raster_done /* raster_done */
)
/* END */

67
src/smooth/ftsmooth.c
Unescape View File

@ -428,7 +428,8 @@
}
FT_DEFINE_RENDERER( ft_smooth_renderer_class,
FT_DEFINE_RENDERER(
ft_smooth_renderer_class,
FT_MODULE_RENDERER,
sizeof ( FT_RendererRec ),
@ -437,25 +438,25 @@
0x10000L,
0x20000L,
0, /* module specific interface */
NULL, /* module specific interface */
(FT_Module_Constructor)ft_smooth_init,
(FT_Module_Destructor) 0,
(FT_Module_Requester) 0
,
(FT_Module_Constructor)ft_smooth_init, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) NULL, /* get_interface */
FT_GLYPH_FORMAT_OUTLINE,
(FT_Renderer_RenderFunc) ft_smooth_render,
(FT_Renderer_TransformFunc)ft_smooth_transform,
(FT_Renderer_GetCBoxFunc) ft_smooth_get_cbox,
(FT_Renderer_SetModeFunc) ft_smooth_set_mode,
(FT_Renderer_RenderFunc) ft_smooth_render, /* render_glyph */
(FT_Renderer_TransformFunc)ft_smooth_transform, /* transform_glyph */
(FT_Renderer_GetCBoxFunc) ft_smooth_get_cbox, /* get_glyph_cbox */
(FT_Renderer_SetModeFunc) ft_smooth_set_mode, /* set_mode */
(FT_Raster_Funcs*) &FT_GRAYS_RASTER_GET
(FT_Raster_Funcs*)&FT_GRAYS_RASTER_GET /* raster_class */
)
FT_DEFINE_RENDERER( ft_smooth_lcd_renderer_class,
FT_DEFINE_RENDERER(
ft_smooth_lcd_renderer_class,
FT_MODULE_RENDERER,
sizeof ( FT_RendererRec ),
@ -464,24 +465,25 @@
0x10000L,
0x20000L,
0, /* module specific interface */
NULL, /* module specific interface */
(FT_Module_Constructor)ft_smooth_init,
(FT_Module_Destructor) 0,
(FT_Module_Requester) 0
,
(FT_Module_Constructor)ft_smooth_init, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) NULL, /* get_interface */
FT_GLYPH_FORMAT_OUTLINE,
(FT_Renderer_RenderFunc) ft_smooth_render_lcd,
(FT_Renderer_TransformFunc)ft_smooth_transform,
(FT_Renderer_GetCBoxFunc) ft_smooth_get_cbox,
(FT_Renderer_SetModeFunc) ft_smooth_set_mode,
(FT_Renderer_RenderFunc) ft_smooth_render_lcd, /* render_glyph */
(FT_Renderer_TransformFunc)ft_smooth_transform, /* transform_glyph */
(FT_Renderer_GetCBoxFunc) ft_smooth_get_cbox, /* get_glyph_cbox */
(FT_Renderer_SetModeFunc) ft_smooth_set_mode, /* set_mode */
(FT_Raster_Funcs*) &FT_GRAYS_RASTER_GET
(FT_Raster_Funcs*)&FT_GRAYS_RASTER_GET /* raster_class */
)
FT_DEFINE_RENDERER( ft_smooth_lcdv_renderer_class,
FT_DEFINE_RENDERER(
ft_smooth_lcdv_renderer_class,
FT_MODULE_RENDERER,
sizeof ( FT_RendererRec ),
@ -490,21 +492,20 @@
0x10000L,
0x20000L,
0, /* module specific interface */
NULL, /* module specific interface */
(FT_Module_Constructor)ft_smooth_init,
(FT_Module_Destructor) 0,
(FT_Module_Requester) 0
,
(FT_Module_Constructor)ft_smooth_init, /* module_init */
(FT_Module_Destructor) NULL, /* module_done */
(FT_Module_Requester) NULL, /* get_interface */
FT_GLYPH_FORMAT_OUTLINE,
(FT_Renderer_RenderFunc) ft_smooth_render_lcd_v,
(FT_Renderer_TransformFunc)ft_smooth_transform,
(FT_Renderer_GetCBoxFunc) ft_smooth_get_cbox,
(FT_Renderer_SetModeFunc) ft_smooth_set_mode,
(FT_Renderer_RenderFunc) ft_smooth_render_lcd_v, /* render_glyph */
(FT_Renderer_TransformFunc)ft_smooth_transform, /* transform_glyph */
(FT_Renderer_GetCBoxFunc) ft_smooth_get_cbox, /* get_glyph_cbox */
(FT_Renderer_SetModeFunc) ft_smooth_set_mode, /* set_mode */
(FT_Raster_Funcs*) &FT_GRAYS_RASTER_GET
(FT_Raster_Funcs*)&FT_GRAYS_RASTER_GET /* raster_class */
)

20
src/truetype/ttdriver.c
Unescape View File

@ -144,8 +144,10 @@
FT_DEFINE_SERVICE_PROPERTIESREC(
tt_service_properties,
(FT_Properties_SetFunc)tt_property_set, /* set_property */
(FT_Properties_GetFunc)tt_property_get ) /* get_property */
(FT_Properties_GetFunc)tt_property_get /* get_property */
)
/*************************************************************************/
@ -464,11 +466,13 @@
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_DEFINE_SERVICE_MULTIMASTERSREC(
tt_service_gx_multi_masters,
(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 */
(FT_Set_Var_Design_Func)TT_Set_Var_Design /* set_var_design */
)
#endif
@ -488,12 +492,15 @@
FT_DEFINE_SERVICE_TTGLYFREC(
tt_service_truetype_glyf,
(TT_Glyf_GetLocationFunc)tt_face_get_location ) /* get_location */
(TT_Glyf_GetLocationFunc)tt_face_get_location /* get_location */
)
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_DEFINE_SERVICEDESCREC5(
tt_services,
FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_TRUETYPE,
FT_SERVICE_ID_MULTI_MASTERS, &TT_SERVICE_GX_MULTI_MASTERS_GET,
FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine,
@ -502,6 +509,7 @@
#else
FT_DEFINE_SERVICEDESCREC4(
tt_services,
FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_TRUETYPE,
FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine,
FT_SERVICE_ID_TT_GLYF, &TT_SERVICE_TRUETYPE_GLYF_GET,
@ -580,7 +588,7 @@
0x10000L, /* driver version == 1.0 */
0x20000L, /* driver requires FreeType 2.0 or above */
0, /* module-specific interface */
NULL, /* module-specific interface */
tt_driver_init, /* FT_Module_Constructor module_init */
tt_driver_done, /* FT_Module_Destructor module_done */
@ -595,12 +603,12 @@
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 */
NULL, /* FT_Slot_DoneFunc done_slot */
tt_glyph_load, /* FT_Slot_LoadFunc load_glyph */
tt_get_kerning, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_AttachFunc attach_file */
tt_get_advances, /* FT_Face_GetAdvancesFunc get_advances */
tt_size_request, /* FT_Size_RequestFunc request_size */

8
src/type1/t1driver.c
Unescape View File

@ -714,7 +714,7 @@
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
T1_Driver_Init, /* FT_Module_Constructor module_init */
T1_Driver_Done, /* FT_Module_Destructor module_done */
@ -735,8 +735,8 @@
T1_Load_Glyph, /* FT_Slot_LoadFunc load_glyph */
#ifdef T1_CONFIG_OPTION_NO_AFM
0, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetKerningFunc get_kerning */
NULL, /* FT_Face_AttachFunc attach_file */
#else
Get_Kerning, /* FT_Face_GetKerningFunc get_kerning */
T1_Read_Metrics, /* FT_Face_AttachFunc attach_file */
@ -744,7 +744,7 @@
T1_Get_Advances, /* FT_Face_GetAdvancesFunc get_advances */
T1_Size_Request, /* FT_Size_RequestFunc request_size */
0 /* FT_Size_SelectFunc select_size */
NULL /* FT_Size_SelectFunc select_size */
};

8
src/type42/t42drivr.c
Unescape View File

@ -214,7 +214,7 @@
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
T42_Driver_Init, /* FT_Module_Constructor module_init */
T42_Driver_Done, /* FT_Module_Destructor module_done */
@ -234,9 +234,9 @@
T42_GlyphSlot_Load, /* FT_Slot_LoadFunc load_glyph */
0, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
0, /* FT_Face_GetAdvancesFunc get_advances */
NULL, /* FT_Face_GetKerningFunc get_kerning */
NULL, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetAdvancesFunc get_advances */
T42_Size_Request, /* FT_Size_RequestFunc request_size */
T42_Size_Select /* FT_Size_SelectFunc select_size */

20
src/winfonts/winfnt.c
Unescape View File

@ -1170,10 +1170,10 @@
0x10000L,
0x20000L,
0, /* module-specific interface */
NULL, /* module-specific interface */
0, /* FT_Module_Constructor module_init */
0, /* FT_Module_Destructor module_done */
NULL, /* FT_Module_Constructor module_init */
NULL, /* FT_Module_Destructor module_done */
winfnt_get_service /* FT_Module_Requester get_interface */
},
@ -1183,16 +1183,16 @@
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 */
NULL, /* FT_Size_InitFunc init_size */
NULL, /* FT_Size_DoneFunc done_size */
NULL, /* FT_Slot_InitFunc init_slot */
NULL, /* FT_Slot_DoneFunc done_slot */
FNT_Load_Glyph, /* FT_Slot_LoadFunc load_glyph */
0, /* FT_Face_GetKerningFunc get_kerning */
0, /* FT_Face_AttachFunc attach_file */
0, /* FT_Face_GetAdvancesFunc get_advances */
NULL, /* FT_Face_GetKerningFunc get_kerning */
NULL, /* FT_Face_AttachFunc attach_file */
NULL, /* FT_Face_GetAdvancesFunc get_advances */
FNT_Size_Request, /* FT_Size_RequestFunc request_size */
FNT_Size_Select /* FT_Size_SelectFunc select_size */

Write Preview
Loading…
Cancel
Save