[cairo-commit] 2 commits - src/cairo-gl-glyphs.c src/cairo-surface-fallback.c

Chris Wilson ickle at kemper.freedesktop.org
Mon Feb 22 07:27:10 PST 2010


 src/cairo-gl-glyphs.c        |    1 +
 src/cairo-surface-fallback.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 21b2457aabf7df2a9f040751cd48e396443262f1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 22 15:26:37 2010 +0000

    fallback: Initialize rects.is_bounded for span renderer.

diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c
index 232e15e..ae39b2b 100644
--- a/src/cairo-surface-fallback.c
+++ b/src/cairo-surface-fallback.c
@@ -867,7 +867,8 @@ _composite_spans_draw_func (void                          *closure,
      * we'd like to place the result. */
     rects.bounded.x -= dst_x;
     rects.bounded.y -= dst_y;
-    rects.unbounded = rects.bounded;;
+    rects.unbounded = rects.bounded;
+    rects.is_bounded = _cairo_operator_bounded_by_either (op);
 
     return _cairo_surface_composite_polygon (dst, op, src,
 					     info->fill_rule,
commit 6dd22b767808f721de5d00fe384711ffaa269453
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 22 15:24:08 2010 +0000

    gl: Initialise glyphs mask to ensure allocation in absence of stash.

diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
index 8ea04ef..b9b1117 100644
--- a/src/cairo-gl-glyphs.c
+++ b/src/cairo-gl-glyphs.c
@@ -656,6 +656,7 @@ _cairo_gl_surface_show_glyphs_via_mask (cairo_gl_surface_t	*dst,
 	return status;
 
     /* XXX: For non-CA, this should be CAIRO_CONTENT_ALPHA to save memory */
+    mask = NULL;
     if (ctx->glyphs_temporary_mask) {
 	if (glyph_extents->width  <= ctx->glyphs_temporary_mask->width &&
 	    glyph_extents->height <= ctx->glyphs_temporary_mask->height)


More information about the cairo-commit mailing list