diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-24 15:45:57 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-24 15:45:57 +0100 |
| commit | 415d5d8fce8b685a92eef7d0ae2568e1ee7e02e7 (patch) | |
| tree | 274296f70a6d2b09e29a6f1d28b42313af45248c /src/cairo-surface-wrapper.c | |
| parent | 8102bd868105770a97e7d895b76b1b3ad40dcee9 (diff) | |
| download | cairo-415d5d8fce8b685a92eef7d0ae2568e1ee7e02e7.tar.gz | |
wrapper: Use the stack for small glyph allocations
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/cairo-surface-wrapper.c')
| -rw-r--r-- | src/cairo-surface-wrapper.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c index 125469734..5a552adaf 100644 --- a/src/cairo-surface-wrapper.c +++ b/src/cairo-surface-wrapper.c @@ -398,7 +398,8 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper, { cairo_status_t status; cairo_clip_t *dev_clip; - cairo_glyph_t *dev_glyphs = glyphs; + cairo_glyph_t stack_glyphs [CAIRO_STACK_ARRAY_LENGTH(cairo_glyph_t)]; + cairo_glyph_t *dev_glyphs = stack_glyphs; cairo_pattern_union_t source_copy; if (unlikely (wrapper->target->status)) @@ -417,10 +418,12 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper, _cairo_surface_wrapper_get_transform (wrapper, &m); - dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); - if (dev_glyphs == NULL) { - status = _cairo_error (CAIRO_STATUS_NO_MEMORY); - goto FINISH; + if (num_glyphs > ARRAY_LENGTH (stack_glyphs)) { + dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); + if (dev_glyphs == NULL) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); + goto FINISH; + } } for (i = 0; i < num_glyphs; i++) { @@ -438,10 +441,12 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper, * to modify the glyph array that's passed in. We must always * copy the array before handing it to the backend. */ - dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); - if (unlikely (dev_glyphs == NULL)) { - status = _cairo_error (CAIRO_STATUS_NO_MEMORY); - goto FINISH; + if (num_glyphs > ARRAY_LENGTH (stack_glyphs)) { + dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); + if (unlikely (dev_glyphs == NULL)) { + status = _cairo_error (CAIRO_STATUS_NO_MEMORY); + goto FINISH; + } } memcpy (dev_glyphs, glyphs, sizeof (cairo_glyph_t) * num_glyphs); @@ -456,7 +461,7 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper, dev_clip); FINISH: _cairo_clip_destroy (dev_clip); - if (dev_glyphs != glyphs) + if (dev_glyphs != stack_glyphs) free (dev_glyphs); return status; } |