[cairo-commit] cairo/src cairo-xlib-surface.c,1.110,1.111

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv19684/src

Modified Files:
	cairo-xlib-surface.c 
Log Message:
2005-08-18  Owen Taylor  <otaylor at redhat.com>

        * 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"


Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- cairo-xlib-surface.c	18 Aug 2005 22:50:36 -0000	1.110
+++ cairo-xlib-surface.c	19 Aug 2005 00:19:54 -0000	1.111
@@ -2290,7 +2290,7 @@
 			    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 @@
 			    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 @@
 			   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 @@
     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);
     }