diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2006-08-15 08:33:20 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2006-08-15 08:33:20 -0400 |
| commit | b7bc263842a798d657a95e539e1693372448837f (patch) | |
| tree | f1959c7b8a7bd440ef447c581d2a674350c0d91f /src/cairo-ft-font.c | |
| parent | d47388ad759b0a1a0869655a87d9b5eb6ae2445d (diff) | |
[FreeType] Fix vertical metrics adjustment to work with non-identity shapes
Diffstat (limited to 'src/cairo-ft-font.c')
| -rw-r--r-- | src/cairo-ft-font.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index e07a59fc1..4eb4ca7b5 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -98,6 +98,7 @@ struct _cairo_ft_unscaled_font { double y_scale; /* Extracted Y scale factor */ cairo_bool_t have_shape; /* true if the current scale has a non-scale component*/ cairo_matrix_t current_shape; + FT_Matrix Current_Shape; int lock; /* count of how many times this font has been locked */ @@ -632,6 +633,7 @@ _cairo_ft_unscaled_font_set_scale (cairo_ft_unscaled_font_t *unscaled, mat.xy != 0x00000 || mat.yy != 0x10000); + unscaled->Current_Shape = mat; cairo_matrix_init (&unscaled->current_shape, sf.shape[0][0], sf.shape[0][1], sf.shape[1][0], sf.shape[1][1], @@ -1733,16 +1735,21 @@ _decompose_glyph_outline (FT_Face face, * Translate glyph to match its metrics. */ static void -_cairo_ft_scaled_glyph_vertical_layout_bearing_fix (FT_GlyphSlot glyph) +_cairo_ft_scaled_glyph_vertical_layout_bearing_fix (void *abstract_font, + FT_GlyphSlot glyph) { - FT_Pos x = glyph->metrics.vertBearingX - glyph->metrics.horiBearingX; - FT_Pos y = -glyph->metrics.vertBearingY - glyph->metrics.horiBearingY; - - if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) - FT_Outline_Translate(&glyph->outline, x, y); - else if (glyph->format == FT_GLYPH_FORMAT_BITMAP) { - glyph->bitmap_left += x / 64; - glyph->bitmap_top += y / 64; + cairo_ft_scaled_font_t *scaled_font = abstract_font; + FT_Vector vector; + + vector.x = glyph->metrics.vertBearingX - glyph->metrics.horiBearingX; + vector.y = -glyph->metrics.vertBearingY - glyph->metrics.horiBearingY; + + if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) { + FT_Vector_Transform (&vector, &scaled_font->unscaled->Current_Shape); + FT_Outline_Translate(&glyph->outline, vector.x, vector.y); + } else if (glyph->format == FT_GLYPH_FORMAT_BITMAP) { + glyph->bitmap_left += vector.x / 64; + glyph->bitmap_top += vector.y / 64; } } @@ -1803,7 +1810,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, #endif if (vertical_layout) - _cairo_ft_scaled_glyph_vertical_layout_bearing_fix (glyph); + _cairo_ft_scaled_glyph_vertical_layout_bearing_fix (scaled_font, glyph); if (info & CAIRO_SCALED_GLYPH_INFO_METRICS) { /* @@ -1940,7 +1947,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, FT_GlyphSlot_Embolden (glyph); #endif if (vertical_layout) - _cairo_ft_scaled_glyph_vertical_layout_bearing_fix (glyph); + _cairo_ft_scaled_glyph_vertical_layout_bearing_fix (scaled_font, glyph); } if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) |