Change order of font and face for API consistency

This commit is contained in:
Behdad Esfahbod 2009-11-06 17:45:38 -05:00
parent f4f1fc970b
commit 52ea47767c
2 changed files with 14 additions and 14 deletions

View File

@ -96,7 +96,7 @@ _get_gpos (hb_face_t *face)
/* TODO the public class_t is a mess */ /* TODO the public class_t is a mess */
hb_bool_t hb_bool_t
hb_ot_layout_has_font_glyph_classes (hb_face_t *face) hb_ot_layout_has_glyph_classes (hb_face_t *face)
{ {
return _get_gdef (face).has_glyph_classes (); return _get_gdef (face).has_glyph_classes ();
} }
@ -312,8 +312,8 @@ hb_ot_layout_get_attach_points (hb_face_t *face,
} }
unsigned int unsigned int
hb_ot_layout_get_lig_carets (hb_face_t *face, hb_ot_layout_get_lig_carets (hb_font_t *font,
hb_font_t *font, hb_face_t *face,
hb_codepoint_t glyph, hb_codepoint_t glyph,
unsigned int start_offset, unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */, unsigned int *caret_count /* IN/OUT */,
@ -553,8 +553,8 @@ hb_ot_layout_has_positioning (hb_face_t *face)
} }
hb_bool_t hb_bool_t
hb_ot_layout_position_lookup (hb_face_t *face, hb_ot_layout_position_lookup (hb_font_t *font,
hb_font_t *font, hb_face_t *face,
hb_buffer_t *buffer, hb_buffer_t *buffer,
unsigned int lookup_index, unsigned int lookup_index,
hb_mask_t mask) hb_mask_t mask)
@ -566,8 +566,8 @@ hb_ot_layout_position_lookup (hb_face_t *face,
} }
void void
hb_ot_layout_position_finish (hb_face_t *face, hb_ot_layout_position_finish (hb_font_t *font,
hb_font_t *font, hb_face_t *face,
hb_buffer_t *buffer) hb_buffer_t *buffer)
{ {
unsigned int i, j; unsigned int i, j;

View File

@ -55,7 +55,7 @@ typedef enum {
* classes in harfbuzz. */ * classes in harfbuzz. */
hb_bool_t hb_bool_t
hb_ot_layout_has_font_glyph_classes (hb_face_t *face); hb_ot_layout_glyph_classes (hb_face_t *face);
hb_ot_layout_glyph_class_t hb_ot_layout_glyph_class_t
hb_ot_layout_get_glyph_class (hb_face_t *face, hb_ot_layout_get_glyph_class (hb_face_t *face,
@ -84,8 +84,8 @@ hb_ot_layout_get_attach_points (hb_face_t *face,
/* Ligature caret positions */ /* Ligature caret positions */
unsigned int unsigned int
hb_ot_layout_get_lig_carets (hb_face_t *face, hb_ot_layout_get_lig_carets (hb_font_t *font,
hb_font_t *font, hb_face_t *face,
hb_codepoint_t glyph, hb_codepoint_t glyph,
unsigned int start_offset, unsigned int start_offset,
unsigned int *caret_count /* IN/OUT */, unsigned int *caret_count /* IN/OUT */,
@ -198,16 +198,16 @@ hb_bool_t
hb_ot_layout_has_positioning (hb_face_t *face); hb_ot_layout_has_positioning (hb_face_t *face);
hb_bool_t hb_bool_t
hb_ot_layout_position_lookup (hb_face_t *face, hb_ot_layout_position_lookup (hb_font_t *font,
hb_font_t *font, hb_face_t *face,
hb_buffer_t *buffer, hb_buffer_t *buffer,
unsigned int lookup_index, unsigned int lookup_index,
hb_mask_t mask); hb_mask_t mask);
/* Should be called after all the position_lookup's are done */ /* Should be called after all the position_lookup's are done */
void void
hb_ot_layout_position_finish (hb_face_t *face, hb_ot_layout_position_finish (hb_font_t *font,
hb_font_t *font, hb_face_t *face,
hb_buffer_t *buffer); hb_buffer_t *buffer);