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

Rename get_kernings() arguments from first/second_glyph to left/right_glyph 

Makes it clear that kerning is in visual order.
This commit is contained in:
Behdad Esfahbod 2011-05-12 12:39:40 -04:00
parent 23d2432219
commit 805af72405
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-font.cc
View File

@ -115,14 +115,14 @@ hb_font_get_glyph_nil (hb_font_t *font HB_UNUSED,
static void static void
hb_font_get_kerning_nil (hb_font_t *font HB_UNUSED, hb_font_get_kerning_nil (hb_font_t *font HB_UNUSED,
void *font_data HB_UNUSED, void *font_data HB_UNUSED,
hb_codepoint_t first_glyph, hb_codepoint_t left_glyph,
hb_codepoint_t second_glyph, hb_codepoint_t right_glyph,
hb_position_t *x_kern, hb_position_t *x_kern,
hb_position_t *y_kern, hb_position_t *y_kern,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
if (font->parent) { if (font->parent) {
hb_font_get_kerning (font->parent, first_glyph, second_glyph, x_kern, y_kern); hb_font_get_kerning (font->parent, left_glyph, right_glyph, x_kern, y_kern);
font->parent_scale_distance (x_kern, y_kern); font->parent_scale_distance (x_kern, y_kern);
return; return;
} }
@ -298,12 +298,12 @@ hb_font_get_glyph (hb_font_t *font,
void void
hb_font_get_kerning (hb_font_t *font, hb_font_get_kerning (hb_font_t *font,
hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, hb_codepoint_t left_glyph, hb_codepoint_t right_glyph,
hb_position_t *x_kern, hb_position_t *y_kern) hb_position_t *x_kern, hb_position_t *y_kern)
{ {
*x_kern = *y_kern = 0; *x_kern = *y_kern = 0;
return font->klass->get.kerning (font, font->user_data, return font->klass->get.kerning (font, font->user_data,
first_glyph, second_glyph, left_glyph, right_glyph,
x_kern, y_kern, x_kern, y_kern,
font->klass->user_data.kerning); font->klass->user_data.kerning);
} }

4
src/hb-font.h
View File

@ -144,7 +144,7 @@ typedef hb_codepoint_t (*hb_font_get_glyph_func_t) (hb_font_t *font, void *font_
hb_codepoint_t unicode, hb_codepoint_t variation_selector, hb_codepoint_t unicode, hb_codepoint_t variation_selector,
void *user_data); void *user_data);
typedef void (*hb_font_get_kerning_func_t) (hb_font_t *font, void *font_data, typedef void (*hb_font_get_kerning_func_t) (hb_font_t *font, void *font_data,
hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, hb_codepoint_t left_glyph, hb_codepoint_t right_glyph,
hb_position_t *x_kern, hb_position_t *y_kern, hb_position_t *x_kern, hb_position_t *y_kern,
void *user_data); void *user_data);
@ -196,7 +196,7 @@ hb_font_get_glyph (hb_font_t *font,
void void
hb_font_get_kerning (hb_font_t *font, hb_font_get_kerning (hb_font_t *font,
hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, hb_codepoint_t left_glyph, hb_codepoint_t right_glyph,
hb_position_t *x_kern, hb_position_t *y_kern); hb_position_t *x_kern, hb_position_t *y_kern);

6
src/hb-ft.cc
View File

@ -131,8 +131,8 @@ hb_ft_get_glyph (hb_font_t *font HB_UNUSED,
static void static void
hb_ft_get_kerning (hb_font_t *font HB_UNUSED, hb_ft_get_kerning (hb_font_t *font HB_UNUSED,
void *font_data, void *font_data,
hb_codepoint_t first_glyph, hb_codepoint_t left_glyph,
hb_codepoint_t second_glyph, hb_codepoint_t right_glyph,
hb_position_t *x_kern, hb_position_t *x_kern,
hb_position_t *y_kern, hb_position_t *y_kern,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
@ -141,7 +141,7 @@ hb_ft_get_kerning (hb_font_t *font HB_UNUSED,
FT_Vector kerning; FT_Vector kerning;
/* TODO: Kern type? */ /* TODO: Kern type? */
if (FT_Get_Kerning (ft_face, first_glyph, second_glyph, FT_KERNING_DEFAULT, &kerning)) if (FT_Get_Kerning (ft_face, left_glyph, right_glyph, FT_KERNING_DEFAULT, &kerning))
return; return;
*x_kern = kerning.x; *x_kern = kerning.x;