summaryrefslogtreecommitdiff
path: root/src/cairo-surface-fallback.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-01-25 09:20:11 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-01-25 09:20:11 +0000
commit38ba696c483c289c2522b124ca628ef602c12126 (patch)
treea270b7f81cfb061d220ca4e67ea5832c371fadd7 /src/cairo-surface-fallback.c
parentb3ba610ec05f863a0830a1f30ed130649fbadfbb (diff)
downloadcairo-38ba696c483c289c2522b124ca628ef602c12126.tar.gz
surface-fallback: We no longer own a reference to the clip surface
_cairo_clip_get_surface() now returns a borrowed reference to the cached surface on the clip, so we must not destroy it - as Carlos pointed out when he hit the assert: 12:55 < KaL> ickle: cairo-surface.c:595: cairo_surface_destroy: Assertion `((*&(&surface->ref_count)->ref_count) > 0)' failed. 12:56 < KaL> ickle: trying to render any pdf file with poppler glib demo after installing cairo from git master 13:00 < KaL> ickle: well, it seems it has nothing ot do with poppler, since it crashes in clearlooks src/clearlooks_draw.c:347
Diffstat (limited to 'src/cairo-surface-fallback.c')
-rw-r--r--src/cairo-surface-fallback.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c
index 7cd8deec4..904778749 100644
--- a/src/cairo-surface-fallback.c
+++ b/src/cairo-surface-fallback.c
@@ -274,7 +274,6 @@ _clip_and_composite_combine (cairo_clip_t *clip,
goto CLEANUP_SURFACE;
_cairo_pattern_init_for_surface (&clip_pattern, clip_surface);
- cairo_surface_destroy (clip_surface);
/* Combine that with the clip */
status = _cairo_surface_composite (CAIRO_OPERATOR_DEST_IN,
@@ -501,8 +500,6 @@ _composite_trap_region (cairo_clip_t *clip,
}
_cairo_pattern_init_for_surface (&mask_pattern, clip_surface);
- cairo_surface_destroy (clip_surface);
-
clip_extents = _cairo_clip_get_extents (clip);
mask_x = extents->x - clip_extents->x;
mask_y = extents->y - clip_extents->y;