From cdc84283e321a3fd14c430b8f991f60ac624204c Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 9 Oct 2003 20:10:36 +0000 Subject: [PATCH] Stub out NULL_POINTER error so drawing to off-screen memory still works even though text does not yet. --- ChangeLog | 6 ++++++ src/cairo-font.c | 14 +++++++------- src/cairo_font.c | 14 +++++++------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ec251b7a..c41768e86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-10-09 Carl Worth + + * src/cairo_font.c: Stub out NULL_POINTER errors as + CAIRO_STATUS_SUCCESS so that drawing to off-screen images still + works even though text does not yet. + 2003-10-04 Carl Worth * src/cairo_hull.c (_cairo_hull_compute): Add cairo_hull.c to diff --git a/src/cairo-font.c b/src/cairo-font.c index cdbe37548..62911d2db 100644 --- a/src/cairo-font.c +++ b/src/cairo-font.c @@ -31,7 +31,7 @@ cairo_int_status_t _cairo_font_init (cairo_font_t *font, const struct cairo_font_backend *backend) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; font->key = (unsigned char *) strdup (CAIRO_FONT_KEY_DEFAULT); cairo_matrix_set_identity (&font->matrix); @@ -45,7 +45,7 @@ cairo_int_status_t _cairo_font_init_copy (cairo_font_t *font, cairo_font_t *other) { if (other == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (other->key) { font->key = (unsigned char *) strdup ((char *) other->key); @@ -88,7 +88,7 @@ cairo_int_status_t _cairo_font_select (cairo_font_t *font, const char *key) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (font->backend->close) font->backend->close (font); @@ -107,7 +107,7 @@ cairo_int_status_t _cairo_font_scale (cairo_font_t *font, double scale) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; cairo_matrix_scale (&font->matrix, scale, scale); @@ -122,7 +122,7 @@ _cairo_font_transform (cairo_font_t *font, cairo_matrix_t m; if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; cairo_matrix_set_affine (&m, a, b, c, d, 0, 0); cairo_matrix_multiply (&font->matrix, &m, &font->matrix); @@ -139,7 +139,7 @@ _cairo_font_text_extents (cairo_font_t *font, double *dx, double *dy) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (!font->backend->text_extents) return CAIRO_STATUS_SUCCESS; @@ -158,7 +158,7 @@ _cairo_font_show_text (cairo_font_t *font, const unsigned char *utf8) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (!font->backend->show_text) return CAIRO_STATUS_SUCCESS; diff --git a/src/cairo_font.c b/src/cairo_font.c index cdbe37548..62911d2db 100644 --- a/src/cairo_font.c +++ b/src/cairo_font.c @@ -31,7 +31,7 @@ cairo_int_status_t _cairo_font_init (cairo_font_t *font, const struct cairo_font_backend *backend) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; font->key = (unsigned char *) strdup (CAIRO_FONT_KEY_DEFAULT); cairo_matrix_set_identity (&font->matrix); @@ -45,7 +45,7 @@ cairo_int_status_t _cairo_font_init_copy (cairo_font_t *font, cairo_font_t *other) { if (other == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (other->key) { font->key = (unsigned char *) strdup ((char *) other->key); @@ -88,7 +88,7 @@ cairo_int_status_t _cairo_font_select (cairo_font_t *font, const char *key) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (font->backend->close) font->backend->close (font); @@ -107,7 +107,7 @@ cairo_int_status_t _cairo_font_scale (cairo_font_t *font, double scale) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; cairo_matrix_scale (&font->matrix, scale, scale); @@ -122,7 +122,7 @@ _cairo_font_transform (cairo_font_t *font, cairo_matrix_t m; if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; cairo_matrix_set_affine (&m, a, b, c, d, 0, 0); cairo_matrix_multiply (&font->matrix, &m, &font->matrix); @@ -139,7 +139,7 @@ _cairo_font_text_extents (cairo_font_t *font, double *dx, double *dy) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (!font->backend->text_extents) return CAIRO_STATUS_SUCCESS; @@ -158,7 +158,7 @@ _cairo_font_show_text (cairo_font_t *font, const unsigned char *utf8) { if (font == NULL) - return CAIRO_INT_STATUS_NULL_POINTER; + return CAIRO_STATUS_SUCCESS; if (!font->backend->show_text) return CAIRO_STATUS_SUCCESS;