[cairo-commit] src/cairo-ft-font.c

[Behdad Esfahbod]

 src/cairo-ft-font.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 89008ad1c7dc7539d1b41315f18910af7e638b75 (from b7bc263842a798d657a95e539e1693372448837f)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Aug 15 13:53:08 2006 -0400

    [FreeType] Use _cairo_ft_scaled_font_is_vertical where appropriate
    instead of poking at the loadflags.

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 4eb4ca7..eddf715 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1467,7 +1467,7 @@ _cairo_ft_scaled_font_create (cairo_ft_u
 	fs_metrics.ascent =        DOUBLE_FROM_26_6(metrics->ascender) * y_factor;
 	fs_metrics.descent =       DOUBLE_FROM_26_6(- metrics->descender) * y_factor;
 	fs_metrics.height =        DOUBLE_FROM_26_6(metrics->height) * y_factor;
-	if (!(scaled_font->ft_options.load_flags & FT_LOAD_VERTICAL_LAYOUT)) {
+	if (!_cairo_ft_scaled_font_is_vertical (&scaled_font->base)) {
 	    fs_metrics.max_x_advance = DOUBLE_FROM_26_6(metrics->max_advance) * x_factor;
 	    fs_metrics.max_y_advance = 0;
 	} else {
@@ -1480,7 +1480,7 @@ _cairo_ft_scaled_font_create (cairo_ft_u
 	fs_metrics.ascent =        face->ascender / scale;
 	fs_metrics.descent =       - face->descender / scale;
 	fs_metrics.height =        face->height / scale;
-	if (!(scaled_font->ft_options.load_flags & FT_LOAD_VERTICAL_LAYOUT)) {
+	if (!_cairo_ft_scaled_font_is_vertical (&scaled_font->base)) {
 	    fs_metrics.max_x_advance = face->max_advance_width / scale;
 	    fs_metrics.max_y_advance = 0;
 	} else {