From c1b5a19624a850885996a6e0778098e77c0fd683 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 18 Aug 2005 17:19:54 +0000 Subject: [PATCH] Fix offset passed in for source patterns. (#2333, Tim Rowley) Fix font to Vera Sans rather than "Sans" --- ChangeLog | 7 +++++++ src/cairo-xlib-surface.c | 18 +++++++++--------- test/.cvsignore | 1 + test/text-pattern-ref.png | Bin 2869 -> 2728 bytes test/text-pattern.c | 9 ++++++--- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index db8e97a8f..451bdbc82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-18 Owen Taylor + + * src/cairo-xlib-surface.c (_cairo_xlib_surface_show_glyphs): Fix offset + passed in for source patterns. (#2333, Tim Rowley) + + * test/text-pattern.c: Fix font to Vera Sans rather than "Sans" + 2005-08-18 Carl Worth * ROADMAP: Update the roadmap. Remove difficulty rating from diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index eafa02a43..42151577e 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -2290,7 +2290,7 @@ _cairo_xlib_surface_show_glyphs32 (cairo_scaled_font_t *scaled_font, src->src_picture, self->dst_picture, mask_format, - source_x, source_y, + source_x + elts[0].xOff, source_y + elts[0].yOff, 0, 0, elts, count); @@ -2393,7 +2393,7 @@ _cairo_xlib_surface_show_glyphs16 (cairo_scaled_font_t *scaled_font, src->src_picture, self->dst_picture, mask_format, - source_x, source_y, + source_x + elts[0].xOff, source_y + elts[0].yOff, 0, 0, elts, count); @@ -2498,7 +2498,7 @@ _cairo_xlib_surface_show_glyphs8 (cairo_scaled_font_t *scaled_font, src->src_picture, self->dst_picture, mask_format, - source_x, source_y, + source_x + elts[0].xOff, source_y + elts[0].yOff, 0, 0, elts, count); @@ -2665,22 +2665,22 @@ _cairo_xlib_surface_show_glyphs (cairo_scaled_font_t *scaled_font, if (elt_size == 8) { status = _cairo_xlib_surface_show_glyphs8 (scaled_font, operator, cache, &key, src, self, - source_x + attributes.x_offset, - source_y + attributes.y_offset, + source_x + attributes.x_offset - dest_x, + source_y + attributes.y_offset - dest_y, glyphs, entries, num_glyphs); } else if (elt_size == 16) { status = _cairo_xlib_surface_show_glyphs16 (scaled_font, operator, cache, &key, src, self, - source_x + attributes.x_offset, - source_y + attributes.y_offset, + source_x + attributes.x_offset - dest_x, + source_y + attributes.y_offset - dest_y, glyphs, entries, num_glyphs); } else { status = _cairo_xlib_surface_show_glyphs32 (scaled_font, operator, cache, &key, src, self, - source_x + attributes.x_offset, - source_y + attributes.y_offset, + source_x + attributes.x_offset - dest_x, + source_y + attributes.y_offset - dest_y, glyphs, entries, num_glyphs); } diff --git a/test/.cvsignore b/test/.cvsignore index d7bea4c93..e09fca989 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -52,6 +52,7 @@ text-antialias-gray text-antialias-none text-antialias-subpixel text-cache-crash +text-pattern text-rotate transforms translate-show-surface diff --git a/test/text-pattern-ref.png b/test/text-pattern-ref.png index 52eed0ac8087aba802d60a4fa672dbf2e4083e1e..6407f3e5c0deada61b92a1dedf3fff6a1ecf2999 100644 GIT binary patch delta 2693 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 diff --git a/test/text-pattern.c b/test/text-pattern.c index 347d83ba7..a337a332e 100644 --- a/test/text-pattern.c +++ b/test/text-pattern.c @@ -1,5 +1,5 @@ /* - * Copyright © 2004 Red Hat, Inc. + * Copyright © 2005 Tim Rowley * * Permission to use, copy, modify, distribute, and sell this software * and its documentation for any purpose is hereby granted without @@ -20,7 +20,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Author: Carl D. Worth + * Author: Tim Rowley */ #include "cairo-test.h" @@ -48,6 +48,10 @@ draw (cairo_t *cr, int width, int height) cairo_set_font_options (cr, font_options); cairo_font_options_destroy (font_options); + cairo_select_font_face (cr, "Bitstream Vera Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + cairo_scale (cr, width, height); pat = cairo_pattern_create_linear (0.0, 0.0, 1, 1); @@ -59,7 +63,6 @@ draw (cairo_t *cr, int width, int height) cairo_rectangle (cr, 0, 0, 0.1, 1); cairo_fill (cr); - cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size (cr, 0.4); cairo_move_to (cr, 0.1, 0.6); cairo_show_text (cr, "cairo");