From d24e9881de7b392cfce1d82c9861553ece558aaf Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Thu, 21 Oct 2010 14:03:38 +0200 Subject: [PATCH] raster backends: Set round_glpyh_positions to ON This fixes "text-rotate" in the test suite for the image backend and "overlapping-glyphs" for the xcb backend. Signed-off-by: Uli Schlachter --- src/cairo-gl-surface.c | 1 + src/cairo-image-surface.c | 1 + src/cairo-win32-printing-surface.c | 1 + src/cairo-xcb-surface.c | 1 + src/cairo-xlib-screen.c | 1 + 5 files changed, 5 insertions(+) diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c index e53506cc6..278e6429d 100644 --- a/src/cairo-gl-surface.c +++ b/src/cairo-gl-surface.c @@ -1368,6 +1368,7 @@ _cairo_gl_surface_get_font_options (void *abstract_surface, _cairo_font_options_init_default (options); cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON); + _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON); } static cairo_status_t diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index 5b2c06341..2d769ea8a 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -4088,6 +4088,7 @@ _cairo_image_surface_get_font_options (void *abstract_surface, _cairo_font_options_init_default (options); cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON); + _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON); } /* legacy interface kept for compatibility until surface-fallback is removed */ diff --git a/src/cairo-win32-printing-surface.c b/src/cairo-win32-printing-surface.c index 497be2506..1e8bd269d 100644 --- a/src/cairo-win32-printing-surface.c +++ b/src/cairo-win32-printing-surface.c @@ -1157,6 +1157,7 @@ _cairo_win32_printing_surface_get_font_options (void *abstract_ cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE); cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_OFF); cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY); + _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON); } static cairo_int_status_t diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index 656e58929..80fc19c5d 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -604,6 +604,7 @@ _cairo_xcb_surface_get_font_options (void *abstract_surface, { /* XXX copy from xlib */ _cairo_font_options_init_default (options); + _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON); } static cairo_status_t diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c index 801dc3da7..a0c3df840 100644 --- a/src/cairo-xlib-screen.c +++ b/src/cairo-xlib-screen.c @@ -447,6 +447,7 @@ _cairo_xlib_screen_get_font_options (cairo_xlib_screen_t *info) { if (! info->has_font_options) { _cairo_font_options_init_default (&info->font_options); + _cairo_font_options_set_round_glyph_positions (&info->font_options, CAIRO_ROUND_GLYPH_POS_ON); if (info->screen != NULL) { cairo_xlib_display_t *display;