From 8dd8347ec2303dd0d0cefda5f6ad192c6fc43db0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 22 Jun 2009 15:19:43 -0400 Subject: [PATCH] Bug 499135: Cairo/Qt fails to build -- yet again, r=mfinkle --- .../cairo/src/cairo-qpainter-surface.cpp | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp index 646d187d6689..57583b1de541 100644 --- a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp @@ -598,25 +598,26 @@ _cairo_qpainter_surface_release_dest_image (void *abstract_surface, } static cairo_status_t -_cairo_qpainter_surface_clone_similar (void *abstract_surface, - cairo_surface_t *src, - int src_x, - int src_y, - int width, - int height, - int *clone_offset_x, - int *clone_offset_y, - cairo_surface_t **clone_out) +_cairo_qpainter_surface_clone_similar (void *abstract_surface, + cairo_surface_t *src, + cairo_content_t content, + int src_x, + int src_y, + int width, + int height, + int *clone_offset_x, + int *clone_offset_y, + cairo_surface_t **clone_out) { cairo_qpainter_surface_t *qs = (cairo_qpainter_surface_t *) abstract_surface; cairo_surface_t *new_surf = NULL; // For non-image targets, always try to create a QPixmap first - if (qs->image == NULL && (!_qpixmaps_have_no_alpha || src->content == CAIRO_CONTENT_COLOR)) + if (qs->image == NULL && (!_qpixmaps_have_no_alpha || content == CAIRO_CONTENT_COLOR)) { new_surf = cairo_qpainter_surface_create_with_qpixmap - (src->content, width, height); - if (cairo_surface_get_content (new_surf) != src->content) { + (content, width, height); + if (cairo_surface_get_content (new_surf) != content) { cairo_surface_destroy (new_surf); _qpixmaps_have_no_alpha = TRUE; new_surf = NULL; @@ -625,7 +626,7 @@ _cairo_qpainter_surface_clone_similar (void *abstract_surface, if (new_surf == NULL) { new_surf = cairo_qpainter_surface_create_with_qimage - (_cairo_format_from_content (src->content), width, height); + (_cairo_format_from_content (content), width, height); } if (new_surf->status)