fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-03-05 17:00:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Originally 2005-05-08 Owen Taylor <otaylor@redhat.com>:

Browse source 
If cairo_create() fails, return a special static object, cairo_nil.
Don't return early if cr->status is set. cr->status should not affect reference counting.
Ignore any magic object with a reference count of -1.
This commit is contained in:
Carl Worth 2005-06-13 16:35:03 +00:00
parent 01e1844e9c
commit 15fb5e0d27
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2005-06-13 Carl Worth <cworth@cworth.org>
Originally 2005-05-08 Owen Taylor <otaylor@redhat.com>:
* src/cairo.c (cairo_create): If cairo_create() fails, return
a special static object, cairo_nil.
* src/cairo.c (cairo_reference): Don't return early if
cr->status is set. cr->status should not affect reference
counting.
* src/cairo.c: (cairo_reference), (cairo_destroy): Ignore any
magic object with a reference count of -1.
2005-06-13 Carl Worth <cworth@cworth.org>
Originally 2005-06-02 Carl Worth <cworth@cworth.org>:

26
src/cairo.c
View file

@ -43,6 +43,19 @@
#define CAIRO_TOLERANCE_MINIMUM 0.0002 /* We're limited by 16 bits of sub-pixel precision */
static const cairo_t cairo_nil = {
(unsigned int)-1, /* ref_count */
NULL, /* gstate */
{ /* path */
NULL, NULL, /* op_buf_head, op_buf_tail */
NULL, NULL, /* arg_buf_head, arg_buf_tail */
{ 0, 0 }, /* last_move_point */
{ 0, 0 }, /* current point */
FALSE, /* has_current_point */
},
CAIRO_STATUS_NO_MEMORY /* status */
};
#include <assert.h>
#ifdef NDEBUG
#define CAIRO_CHECK_SANITY(cr)
@ -100,6 +113,11 @@ cairo_sane_state (cairo_t *cr)
* Return value: a newly allocated #cairo_t with a reference
* count of 1. The initial reference count should be released
* with cairo_destroy() when you are done using the #cairo_t.
* This function never returns %NULL. If memory cannot be
* allocated, a special #cairo_t object will be returned on
* which cairo_status() returns %CAIRO_STATUS_NO_MEMORY.
* You can use this object normally, but no drawing will
* be done.
**/
cairo_t *
cairo_create (cairo_surface_t *target)
@ -108,7 +126,7 @@ cairo_create (cairo_surface_t *target)
cr = malloc (sizeof (cairo_t));
if (cr == NULL)
return NULL;
return (cairo_t *) &cairo_nil;
cr->status = CAIRO_STATUS_SUCCESS;
cr->ref_count = 1;
@ -141,7 +159,8 @@ void
cairo_reference (cairo_t *cr)
{
CAIRO_CHECK_SANITY (cr);
if (cr->status)
if (cr->ref_count == (unsigned int)-1)
return;
cr->ref_count++;
@ -160,6 +179,9 @@ void
cairo_destroy (cairo_t *cr)
{
CAIRO_CHECK_SANITY (cr);
if (cr->ref_count == (unsigned int)-1)
return;
cr->ref_count--;
if (cr->ref_count)