[cairo-commit] src/cairo-pdf-surface.c src/cairo-ps-surface.c src/cairo-svg-surface.c

[Carl Worth]

 src/cairo-pdf-surface.c |    4 ++--
 src/cairo-ps-surface.c  |    4 ++--
 src/cairo-svg-surface.c |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
diff-tree b8b507c0920ddef35363ba1d75e4ba0ca141a028 (from 5f94275a4b667d8b1f41f87f1a6b84b3fa3f0616)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Aug 18 16:12:43 2006 -0700

    Use &image->base as appropriate to avoid warnings.

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index 6caee3d..91a1968 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1860,8 +1860,8 @@ _cairo_pdf_surface_emit_bitmap_glyph (ca
     image = scaled_glyph->surface;
     if (image->format != CAIRO_FORMAT_A1) {
 	image = _cairo_image_surface_clone (image, CAIRO_FORMAT_A1);
-	if (cairo_surface_status (image))
-	    return cairo_surface_status (image);
+	if (cairo_surface_status (&image->base))
+	    return cairo_surface_status (&image->base);
     }
 
     *glyph_ret = _cairo_pdf_surface_open_stream (surface, NULL);
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index ba8a808..6ae3a38 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -549,8 +549,8 @@ _cairo_ps_surface_emit_bitmap_glyph_data
     image = scaled_glyph->surface;
     if (image->format != CAIRO_FORMAT_A1) {
 	image = _cairo_image_surface_clone (image, CAIRO_FORMAT_A1);
-	if (cairo_surface_status (image))
-	    return cairo_surface_status (image);
+	if (cairo_surface_status (&image->base))
+	    return cairo_surface_status (&image->base);
     }
 
     _cairo_output_stream_printf (surface->final_stream,
diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 7c99c97..abc1ec3 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -575,8 +575,8 @@ _cairo_svg_document_emit_bitmap_glyph_da
     image = scaled_glyph->surface;
     if (image->format != CAIRO_FORMAT_A1) {
 	image = _cairo_image_surface_clone (image, CAIRO_FORMAT_A1);
-	if (cairo_surface_status (image))
-	    return cairo_surface_status (image);
+	if (cairo_surface_status (&image->base))
+	    return cairo_surface_status (&image->base);
     }
 
     _cairo_output_stream_printf (document->xml_node_glyphs, "<g");
@@ -598,7 +598,7 @@ _cairo_svg_document_emit_bitmap_glyph_da
     _cairo_output_stream_printf (document->xml_node_glyphs, "</g>\n");
 
     if (image != scaled_glyph->surface)
-	cairo_surface_destroy (image);
+	cairo_surface_destroy (&image->base);
 
     return CAIRO_STATUS_SUCCESS;
 }