From ef4209a8a1fdcf7226bec2c6481a4f8239d63ec3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 29 Jul 2005 15:31:48 +0000 Subject: [PATCH] src/cairo-quartz-surface.c (_cairo_quartz_surface_acquire_dest_image): Minor updates to keep quartz backend limping along. --- ChangeLog | 6 ++++++ src/cairo-atsui-font.c | 1 + src/cairo-quartz-surface.c | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ecb773fd5..b5d37120b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-29 T Rowley + + * src/cairo-atsui-font.c ( _cairo_atsui_font_create): + src/cairo-quartz-surface.c (_cairo_quartz_surface_acquire_dest_image): + Minor updates to keep quartz backend limping along. + 2005-07-29 Owen Taylor * src/cairo-font.c src/cairo-ft-font.c src/cairo-win32-font.c diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c index 990a23117..bf5ecb283 100644 --- a/src/cairo-atsui-font.c +++ b/src/cairo-atsui-font.c @@ -110,6 +110,7 @@ _cairo_atsui_font_create(const char *family, cairo_font_weight_t weight, const cairo_matrix_t *font_matrix, const cairo_matrix_t *ctm, + const cairo_font_options_t *options, cairo_scaled_font_t **font_out) { cairo_atsui_font_t *font = NULL; diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index af92c0104..0d847391f 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -152,7 +152,8 @@ _cairo_quartz_surface_acquire_dest_image(void *abstract_surface, image_rect->height = surface->image->height; *image_out = surface->image; - *image_extra = NULL; + if (image_extra) + *image_extra = NULL; return CAIRO_STATUS_SUCCESS; }