From 7143d8b7aee74ed4d75985158bf3dda147f3d21d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 27 Jul 2005 16:23:11 +0000 Subject: [PATCH] Go back to returning NULL. src/cairoint.h src/cairo-ft-font.c: Stop exporting _cairo_scaled_font_nil, since we dont' need it publically any more. return surface->status not status. (Fixes warning) --- ChangeLog | 13 +++++++++++++ src/cairo-font.c | 2 +- src/cairo-ft-font.c | 4 ++-- src/cairo-surface.c | 2 +- src/cairo-win32-font.c | 6 ++---- src/cairoint.h | 2 -- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92ccbd0f5..0162cf8f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-07-27 Owen Taylor + + * src/cairo-win32-font.c (_win32_scaled_font_create): + * src/cairo-ft-font.c (_ft_scaled_font_create): Go back to + returning NULL. + + * src/cairoint.h src/cairo-ft-font.c: Stop exporting + _cairo_scaled_font_nil, since we dont' need it publically + any more. + + * src/cairo-surface.c (_cairo_surface_reset_clip): return + surface->status not status. (Fixes warning) + 2005-07-26 Carl Worth * src/cairo.h: Add CAIRO_STATUS_INVALID_CONTENT, diff --git a/src/cairo-font.c b/src/cairo-font.c index 69ce73505..8fc3b6872 100644 --- a/src/cairo-font.c +++ b/src/cairo-font.c @@ -421,7 +421,7 @@ _cairo_simple_font_face_create (const char *family, /* cairo_scaled_font_t */ -const cairo_scaled_font_t _cairo_scaled_font_nil = { +static const cairo_scaled_font_t _cairo_scaled_font_nil = { CAIRO_STATUS_NO_MEMORY, /* status */ -1, /* ref_count */ { 1., 0., 0., 1., 0, 0}, /* font_matrix */ diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index bd9c6fe6e..e1124afed 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -1377,8 +1377,8 @@ _ft_scaled_font_create (ft_unscaled_font_t *unscaled, cairo_ft_scaled_font_t *f = NULL; f = malloc (sizeof(cairo_ft_scaled_font_t)); - if (f == NULL) - return (cairo_scaled_font_t*) &_cairo_scaled_font_nil; + if (f == NULL) + return NULL; f->unscaled = unscaled; _cairo_unscaled_font_reference (&unscaled->base); diff --git a/src/cairo-surface.c b/src/cairo-surface.c index b023ce0da..34967f2a1 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -1038,7 +1038,7 @@ _cairo_surface_reset_clip (cairo_surface_t *surface) cairo_status_t status; if (surface->status) - return status; + return surface->status; if (surface->finished) return CAIRO_STATUS_SURFACE_FINISHED; diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c index 41ba17164..1384d6622 100644 --- a/src/cairo-win32-font.c +++ b/src/cairo-win32-font.c @@ -223,10 +223,8 @@ _win32_scaled_font_create (LOGFONTW *logfont, cairo_matrix_t scale; f = malloc (sizeof(cairo_win32_scaled_font_t)); - if (f == NULL) { - _cairo_error (CAIRO_STATUS_NO_MEMORY); - return &_cairo_scaled_font_nil; - } + if (f == NULL) + return NULL; f->logfont = *logfont; f->options = *options; diff --git a/src/cairoint.h b/src/cairoint.h index 1a3d5c5aa..9eca40e6d 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -1311,8 +1311,6 @@ _cairo_simple_font_face_create (const char *family, cairo_font_slant_t slant, cairo_font_weight_t weight); -extern const cairo_scaled_font_t _cairo_scaled_font_nil; - cairo_private void _cairo_scaled_font_init (cairo_scaled_font_t *scaled_font, const cairo_matrix_t *font_matrix,