walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[HB] Add font funcs prototypes

This commit is contained in:
Behdad Esfahbod 2009-08-18 18:37:36 -04:00
parent 8f034d5849
commit 32c65a5ca3
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-font-private.h
View File

@ -45,12 +45,10 @@ struct _hb_font_funcs_t {
hb_bool_t immutable; hb_bool_t immutable;
/*
hb_font_get_glyph_func_t glyph_func; hb_font_get_glyph_func_t glyph_func;
hb_font_get_contour_point_func_t contour_point_func; hb_font_get_contour_point_func_t contour_point_func;
hb_font_get_glyph_metrics_func_t glyph_metrics_func; hb_font_get_glyph_metrics_func_t glyph_metrics_func;
hb_font_get_kerning_func_t kerning_func; hb_font_get_kerning_func_t kerning_func;
*/
}; };
HB_INTERNAL hb_font_funcs_t HB_INTERNAL hb_font_funcs_t

12
src/hb-font.cc
View File

@ -40,14 +40,12 @@
hb_font_funcs_t _hb_font_funcs_nil = { hb_font_funcs_t _hb_font_funcs_nil = {
HB_REFERENCE_COUNT_INVALID, /* ref_count */ HB_REFERENCE_COUNT_INVALID, /* ref_count */
TRUE /* immutable */ TRUE, /* immutable */
/* NULL, /* glyph_func */
hb_font_get_glyph_func_t glyph_func; NULL, /* contour_point_func */
hb_font_get_contour_point_func_t contour_point_func; NULL, /* glyph_metrics_func */
hb_font_get_glyph_metrics_func_t glyph_metrics_func; NULL /* kerning_func */
hb_font_get_kerning_func_t kerning_func;
*/
}; };
hb_font_funcs_t * hb_font_funcs_t *

23
src/hb-font.h
View File

@ -33,13 +33,13 @@
HB_BEGIN_DECLS HB_BEGIN_DECLS
typedef struct _hb_face_t hb_face_t;
typedef struct _hb_font_t hb_font_t;
/* /*
* hb_face_t * hb_face_t
*/ */
typedef struct _hb_face_t hb_face_t;
hb_face_t * hb_face_t *
hb_face_create_for_data (hb_blob_t *blob, hb_face_create_for_data (hb_blob_t *blob,
unsigned int index); unsigned int index);
@ -94,7 +94,20 @@ hb_font_funcs_copy (hb_font_funcs_t *ffuncs);
void void
hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs); hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs);
/*
/* funcs */
typedef struct _hb_glyph_metrics_t hb_glyph_metrics_t;
typedef hb_codepoint_t (*hb_font_get_glyph_func_t) (hb_font_t *font, hb_face_t *face, const void *user_data,
hb_codepoint_t unicode, hb_codepoint_t variant_selector);
typedef hb_bool_t (*hb_font_get_contour_point_func_t) (hb_font_t *font, hb_face_t *face, const void *user_data,
hb_codepoint_t glyph, hb_position_t *x, hb_position_t *y);
typedef void (*hb_font_get_glyph_metrics_func_t) (hb_font_t *font, hb_face_t *face, const void *user_data,
hb_codepoint_t glyph, hb_glyph_metrics_t *metrics);
typedef hb_position_t (*hb_font_get_kerning_func_t) (hb_font_t *font, hb_face_t *face, const void *user_data,
hb_codepoint_t first_glyph, hb_codepoint_t second_glyph);
void void
hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs, hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
@ -112,8 +125,6 @@ void
hb_font_funcs_set_kerning_func (hb_font_funcs_t *ffuncs, hb_font_funcs_set_kerning_func (hb_font_funcs_t *ffuncs,
hb_font_get_kerning_func_t kerning_func); hb_font_get_kerning_func_t kerning_func);
*/
/* /*
* hb_font_t * hb_font_t
@ -121,8 +132,6 @@ hb_font_funcs_set_kerning_func (hb_font_funcs_t *ffuncs,
/* Fonts are very light-weight objects */ /* Fonts are very light-weight objects */
typedef struct _hb_font_t hb_font_t;
hb_font_t * hb_font_t *
hb_font_create (void); hb_font_create (void);