diff options
| author | Søren Sandmann <sandmann@redhat.com> | 2008-12-11 13:13:19 -0500 |
|---|---|---|
| committer | Søren Sandmann <sandmann@redhat.com> | 2008-12-11 13:13:19 -0500 |
| commit | 51c51b8da7b49d273631ccbc3afca55b1173b051 (patch) | |
| tree | 34797cfda80e9866122fd9f544beb260a359c76f /src/cairo-hull.c | |
| parent | 96012e97519bbb973ec91536428143b411158541 (diff) | |
| parent | 391c6026402dee09bb34816637114cea990cd93a (diff) | |
Merge branch 'master' into newcoveringcovering
Conflicts:
src/cairo.c
Diffstat (limited to 'src/cairo-hull.c')
| -rw-r--r-- | src/cairo-hull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cairo-hull.c b/src/cairo-hull.c index 008ba7fd..a699a524 100644 --- a/src/cairo-hull.c +++ b/src/cairo-hull.c @@ -200,7 +200,7 @@ _cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices) if (num_hull > ARRAY_LENGTH (hull_stack)) { hull = _cairo_malloc_ab (num_hull, sizeof (cairo_hull_t)); - if (hull == NULL) + if (unlikely (hull == NULL)) return _cairo_error (CAIRO_STATUS_NO_MEMORY); } else { hull = hull_stack; |