diff options
| author | Søren Sandmann Pedersen <sandmann@annarchy.freedesktop.org> | 2007-07-02 08:33:29 -0700 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@annarchy.freedesktop.org> | 2007-07-02 08:33:29 -0700 |
| commit | ef967be630dd8d0bf81ad5889d6264bebe7631d4 (patch) | |
| tree | bd13259091acc26ed8563790f04982f509351a62 /src/cairo-surface-fallback.c | |
| parent | 0c42dbb1925efb8228fb5246e0715bee0a5ded28 (diff) | |
| parent | 5c7d2d14d78e4dfb1ef6d2c40f0910f177e07360 (diff) | |
Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/cairo
Conflicts:
pixman/src/fbcompose.c
pixman/src/icimage.c
pixman/src/pixmanint.h
pixman/src/pixregionint.h
src/cairo-clip.c
Diffstat (limited to 'src/cairo-surface-fallback.c')
| -rw-r--r-- | src/cairo-surface-fallback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c index 8d5c80f3..03978098 100644 --- a/src/cairo-surface-fallback.c +++ b/src/cairo-surface-fallback.c @@ -1165,7 +1165,7 @@ _cairo_surface_fallback_fill_rectangles (cairo_surface_t *surface, /* If the fetched image isn't at 0,0, we need to offset the rectangles */ if (state.image_rect.x != 0 || state.image_rect.y != 0) { - offset_rects = malloc (sizeof (cairo_rectangle_int16_t) * num_rects); + offset_rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int16_t)); if (offset_rects == NULL) { status = CAIRO_STATUS_NO_MEMORY; goto DONE; @@ -1221,7 +1221,7 @@ _cairo_surface_fallback_composite_trapezoids (cairo_operator_t op, /* If the destination image isn't at 0,0, we need to offset the trapezoids */ if (state.image_rect.x != 0 || state.image_rect.y != 0) { - offset_traps = malloc (sizeof (cairo_trapezoid_t) * num_traps); + offset_traps = _cairo_malloc_ab (num_traps, sizeof (cairo_trapezoid_t)); if (!offset_traps) { status = CAIRO_STATUS_NO_MEMORY; goto DONE; |