[cairo-commit] cairo/src cairo-glitz-surface.c, 1.28,
1.29 cairo-image-surface.c, 1.34, 1.35 cairo-pdf-surface.c,
1.26, 1.27 cairo-ps-surface.c, 1.30,
1.31 cairo-quartz-surface.c, 1.6, 1.7 cairo-surface.c, 1.53,
1.54 cairo-win32-surface.c, 1.16, 1.17 cairo-xcb-surface.c,
1.21, 1.22 cairo-xlib-surface.c, 1.57, 1.58
Carl Worth
commit at pdx.freedesktop.org
Thu Apr 7 14:25:02 PDT 2005
Committed by: cworth
Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv27102/src
Modified Files:
cairo-glitz-surface.c cairo-image-surface.c
cairo-pdf-surface.c cairo-ps-surface.c cairo-quartz-surface.c
cairo-surface.c cairo-win32-surface.c cairo-xcb-surface.c
cairo-xlib-surface.c
Log Message:
* src/cairo-surface.c: (_cairo_surface_release_source_image),
(_cairo_surface_release_dest_image),
(_cairo_surface_clone_similar), (_cairo_surface_composite),
(_cairo_surface_fill_rectangles),
(_cairo_surface_composite_trapezoids), (_cairo_surface_copy_page),
(_cairo_surface_show_page), (_cairo_surface_show_glyphs):
Change to allow NULL backend function pointers to indicate
unsupported functions.
* src/cairo-glitz-surface.c:
* src/cairo-image-surface.c:
* src/cairo-pdf-surface.c:
* src/cairo-ps-surface.c:
* src/cairo-quartz-surface.c:
* src/cairo-win32-surface.c:
* src/cairo-xcb-surface.c:
* src/cairo-xlib-surface.c: Eliminate stub functions and replace
with NULL in surface backend table.
Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cairo-glitz-surface.c 4 Apr 2005 13:49:19 -0000 1.28
+++ cairo-glitz-surface.c 7 Apr 2005 21:25:00 -0000 1.29
@@ -1204,18 +1204,6 @@
}
static cairo_int_status_t
-_cairo_glitz_surface_copy_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_glitz_surface_show_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
_cairo_glitz_surface_set_clip_region (void *abstract_surface,
pixman_region16_t *region)
{
@@ -1262,8 +1250,8 @@
_cairo_glitz_surface_composite,
_cairo_glitz_surface_fill_rectangles,
_cairo_glitz_surface_composite_trapezoids,
- _cairo_glitz_surface_copy_page,
- _cairo_glitz_surface_show_page,
+ NULL, /* copy_page */
+ NULL, /* show_page */
_cairo_glitz_surface_set_clip_region,
NULL /* show_glyphs */
};
Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cairo-image-surface.c 7 Apr 2005 17:01:49 -0000 1.34
+++ cairo-image-surface.c 7 Apr 2005 21:25:00 -0000 1.35
@@ -594,18 +594,6 @@
}
static cairo_int_status_t
-_cairo_image_surface_copy_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_image_surface_show_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
_cairo_image_abstract_surface_set_clip_region (void *abstract_surface,
pixman_region16_t *region)
{
@@ -661,8 +649,8 @@
_cairo_image_surface_composite,
_cairo_image_surface_fill_rectangles,
_cairo_image_surface_composite_trapezoids,
- _cairo_image_surface_copy_page,
- _cairo_image_surface_show_page,
+ NULL, /* copy_page */
+ NULL, /* show_page */
_cairo_image_abstract_surface_set_clip_region,
NULL /* show_glyphs */
};
Index: cairo-pdf-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pdf-surface.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cairo-pdf-surface.c 7 Apr 2005 18:04:00 -0000 1.26
+++ cairo-pdf-surface.c 7 Apr 2005 21:25:00 -0000 1.27
@@ -1143,48 +1143,6 @@
}
}
-static cairo_status_t
-_cairo_pdf_surface_acquire_source_image (void *abstract_surface,
- cairo_image_surface_t **image_out,
- void **image_extra)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static void
-_cairo_pdf_surface_release_source_image (void *abstract_surface,
- cairo_image_surface_t *image,
- void *image_extra)
-{
-}
-
-static cairo_status_t
-_cairo_pdf_surface_acquire_dest_image (void *abstract_surface,
- cairo_rectangle_t *interest_rect,
- cairo_image_surface_t **image_out,
- cairo_rectangle_t *image_rect,
- void **image_extra)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static void
-_cairo_pdf_surface_release_dest_image (void *abstract_surface,
- cairo_rectangle_t *interest_rect,
- cairo_image_surface_t *image,
- cairo_rectangle_t *image_rect,
- void *image_extra)
-{
-}
-
-static cairo_status_t
-_cairo_pdf_surface_clone_similar (void *abstract_surface,
- cairo_surface_t *src,
- cairo_surface_t **clone_out)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
static void *
compress_dup (const void *data, unsigned long data_size,
unsigned long *compressed_size)
@@ -1756,13 +1714,6 @@
return status;
}
-static cairo_int_status_t
-_cairo_pdf_surface_set_clip_region (void *abstract_surface,
- pixman_region16_t *region)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
static cairo_pdf_font_t *
_cairo_pdf_document_get_font (cairo_pdf_document_t *document,
cairo_scaled_font_t *scaled_font)
@@ -1847,17 +1798,17 @@
static const cairo_surface_backend_t cairo_pdf_surface_backend = {
_cairo_pdf_surface_create_similar,
_cairo_pdf_surface_finish,
- _cairo_pdf_surface_acquire_source_image,
- _cairo_pdf_surface_release_source_image,
- _cairo_pdf_surface_acquire_dest_image,
- _cairo_pdf_surface_release_dest_image,
- _cairo_pdf_surface_clone_similar,
+ NULL, /* acquire_source_image */
+ NULL, /* release_source_image */
+ NULL, /* acquire_dest_image */
+ NULL, /* release_dest_image */
+ NULL, /* clone_similar */
_cairo_pdf_surface_composite,
_cairo_pdf_surface_fill_rectangles,
_cairo_pdf_surface_composite_trapezoids,
_cairo_pdf_surface_copy_page,
_cairo_pdf_surface_show_page,
- _cairo_pdf_surface_set_clip_region,
+ NULL, /* set_clip_region */
_cairo_pdf_surface_show_glyphs
};
Index: cairo-ps-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ps-surface.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- cairo-ps-surface.c 4 Apr 2005 13:49:19 -0000 1.30
+++ cairo-ps-surface.c 7 Apr 2005 21:25:00 -0000 1.31
@@ -171,13 +171,6 @@
return CAIRO_STATUS_SUCCESS;
}
-static void
-_cairo_ps_surface_release_source_image (void *abstract_surface,
- cairo_image_surface_t *image,
- void *image_extra)
-{
-}
-
static cairo_status_t
_cairo_ps_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_t *interest_rect,
@@ -197,66 +190,6 @@
return CAIRO_STATUS_SUCCESS;
}
-static void
-_cairo_ps_surface_release_dest_image (void *abstract_surface,
- cairo_rectangle_t *interest_rect,
- cairo_image_surface_t *image,
- cairo_rectangle_t *image_rect,
- void *image_extra)
-{
-}
-
-static cairo_status_t
-_cairo_ps_surface_clone_similar (void *abstract_surface,
- cairo_surface_t *src,
- cairo_surface_t **clone_out)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_ps_surface_composite (cairo_operator_t operator,
- cairo_pattern_t *src,
- cairo_pattern_t *mask,
- void *abstract_dst,
- int src_x,
- int src_y,
- int mask_x,
- int mask_y,
- int dst_x,
- int dst_y,
- unsigned int width,
- unsigned int height)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_ps_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
- const cairo_color_t *color,
- cairo_rectangle_t *rects,
- int num_rects)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_ps_surface_composite_trapezoids (cairo_operator_t operator,
- cairo_pattern_t *generic_src,
- void *abstract_dst,
- int x_src,
- int y_src,
- int x_dst,
- int y_dst,
- unsigned int width,
- unsigned int height,
- cairo_trapezoid_t *traps,
- int num_traps)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
static cairo_int_status_t
_cairo_ps_surface_copy_page (void *abstract_surface)
{
@@ -379,13 +312,13 @@
_cairo_ps_surface_create_similar,
_cairo_ps_surface_finish,
_cairo_ps_surface_acquire_source_image,
- _cairo_ps_surface_release_source_image,
+ NULL, /* release_source_image */
_cairo_ps_surface_acquire_dest_image,
- _cairo_ps_surface_release_dest_image,
- _cairo_ps_surface_clone_similar,
- _cairo_ps_surface_composite,
- _cairo_ps_surface_fill_rectangles,
- _cairo_ps_surface_composite_trapezoids,
+ NULL, /* release_dest_image */
+ NULL, /* clone_similar */
+ NULL, /* composite */
+ NULL, /* fill_rectangles */
+ NULL, /* composite_trapezoids */
_cairo_ps_surface_copy_page,
_cairo_ps_surface_show_page,
_cairo_ps_surface_set_clip_region,
Index: cairo-quartz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-quartz-surface.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cairo-quartz-surface.c 4 Apr 2005 13:49:19 -0000 1.6
+++ cairo-quartz-surface.c 7 Apr 2005 21:25:00 -0000 1.7
@@ -171,15 +171,6 @@
return CAIRO_STATUS_SUCCESS;
}
-
-static void
-_cairo_quartz_surface_release_source_image(void *abstract_surface,
- cairo_image_surface_t * image,
- void *image_extra)
-{
-}
-
-
static cairo_status_t
_cairo_quartz_surface_acquire_dest_image(void *abstract_surface,
cairo_rectangle_t * interest_rect,
@@ -222,71 +213,6 @@
}
}
-
-static cairo_status_t
-_cairo_quartz_surface_clone_similar(void *surface,
- cairo_surface_t * src,
- cairo_surface_t ** clone_out)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
-static cairo_int_status_t
-_cairo_quartz_surface_composite(cairo_operator_t operator,
- cairo_surface_t * generic_src,
- cairo_surface_t * generic_mask,
- void *abstract_dst,
- int src_x,
- int src_y,
- int mask_x,
- int mask_y,
- int dst_x,
- int dst_y,
- unsigned int width, unsigned int height)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
-static cairo_int_status_t
-_cairo_quartz_surface_fill_rectangles(void *abstract_surface,
- cairo_operator_t operator,
- const cairo_color_t * color,
- cairo_rectangle_t * rects,
- int num_rects)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
-static cairo_int_status_t
-_cairo_quartz_surface_composite_trapezoids(cairo_operator_t operator,
- cairo_surface_t * generic_src,
- void *abstract_dst,
- int xSrc,
- int ySrc,
- cairo_trapezoid_t * traps,
- int num_traps)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
-static cairo_int_status_t
-_cairo_quartz_surface_copy_page(void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
-static cairo_int_status_t
-_cairo_quartz_surface_show_page(void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
static cairo_int_status_t
_cairo_quartz_surface_set_clip_region(void *abstract_surface,
pixman_region16_t * region)
@@ -296,40 +222,21 @@
return _cairo_image_surface_set_clip_region(surface->image, region);
}
-
-static cairo_status_t
-_cairo_quartz_surface_show_glyphs(cairo_font_t * font,
- cairo_operator_t operator,
- cairo_pattern_t * pattern,
- void *abstract_surface,
- int source_x,
- int source_y,
- int dest_x,
- int dest_y,
- unsigned int width,
- unsigned int height,
- const cairo_glyph_t * glyphs,
- int num_glyphs)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-
static const struct _cairo_surface_backend cairo_quartz_surface_backend = {
_cairo_quartz_surface_create_similar,
_cairo_quartz_surface_finish,
_cairo_quartz_surface_acquire_source_image,
- _cairo_quartz_surface_release_source_image,
+ NULL, /* release_source_image */
_cairo_quartz_surface_acquire_dest_image,
_cairo_quartz_surface_release_dest_image,
- _cairo_quartz_surface_clone_similar,
- _cairo_quartz_surface_composite,
- _cairo_quartz_surface_fill_rectangles,
- _cairo_quartz_surface_composite_trapezoids,
- _cairo_quartz_surface_copy_page,
- _cairo_quartz_surface_show_page,
+ NULL, /* clone_similar */
+ NULL, /* composite */
+ NULL, /* fill_rectangles */
+ NULL, /* composite_trapezoids */
+ NULL, /* copy_page */
+ NULL, /* show_page */
_cairo_quartz_surface_set_clip_region,
- _cairo_quartz_surface_show_glyphs
+ NULL /* show_glyphs */
};
Index: cairo-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-surface.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- cairo-surface.c 7 Apr 2005 18:04:00 -0000 1.53
+++ cairo-surface.c 7 Apr 2005 21:25:00 -0000 1.54
@@ -350,7 +350,8 @@
{
assert (!surface->finished);
- surface->backend->release_source_image (surface, image, image_extra);
+ if (surface->backend->release_source_image)
+ surface->backend->release_source_image (surface, image, image_extra);
}
/**
@@ -415,8 +416,9 @@
{
assert (!surface->finished);
- surface->backend->release_dest_image (surface, interest_rect,
- image, image_rect, image_extra);
+ if (surface->backend->release_dest_image)
+ surface->backend->release_dest_image (surface, interest_rect,
+ image, image_rect, image_extra);
}
/**
@@ -447,9 +449,11 @@
if (surface->finished)
return CAIRO_STATUS_SURFACE_FINISHED;
- status = surface->backend->clone_similar (surface, src, clone_out);
- if (status != CAIRO_INT_STATUS_UNSUPPORTED)
- return status;
+ if (surface->backend->clone_similar) {
+ status = surface->backend->clone_similar (surface, src, clone_out);
+ if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+ return status;
+ }
status = _cairo_surface_acquire_source_image (src, &image, &image_extra);
if (status != CAIRO_STATUS_SUCCESS)
@@ -632,14 +636,16 @@
if (dst->finished)
return CAIRO_STATUS_SURFACE_FINISHED;
- status = dst->backend->composite (operator,
- src, mask, dst,
- src_x, src_y,
- mask_x, mask_y,
- dst_x, dst_y,
- width, height);
- if (status != CAIRO_INT_STATUS_UNSUPPORTED)
- return status;
+ if (dst->backend->composite) {
+ status = dst->backend->composite (operator,
+ src, mask, dst,
+ src_x, src_y,
+ mask_x, mask_y,
+ dst_x, dst_y,
+ width, height);
+ if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+ return status;
+ }
return _fallback_composite (operator,
src, mask, dst,
@@ -757,12 +763,14 @@
if (num_rects == 0)
return CAIRO_STATUS_SUCCESS;
- status = surface->backend->fill_rectangles (surface,
- operator,
- color,
- rects, num_rects);
- if (status != CAIRO_INT_STATUS_UNSUPPORTED)
- return status;
+ if (surface->backend->fill_rectangles) {
+ status = surface->backend->fill_rectangles (surface,
+ operator,
+ color,
+ rects, num_rects);
+ if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+ return status;
+ }
return _fallback_fill_rectangles (surface, operator, color, rects, num_rects);
}
@@ -852,14 +860,16 @@
if (dst->finished)
return CAIRO_STATUS_SURFACE_FINISHED;
- status = dst->backend->composite_trapezoids (operator,
- pattern, dst,
- src_x, src_y,
- dst_x, dst_y,
- width, height,
- traps, num_traps);
- if (status != CAIRO_INT_STATUS_UNSUPPORTED)
- return status;
+ if (dst->backend->composite_trapezoids) {
+ status = dst->backend->composite_trapezoids (operator,
+ pattern, dst,
+ src_x, src_y,
+ dst_x, dst_y,
+ width, height,
+ traps, num_traps);
+ if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+ return status;
+ }
return _fallback_composite_trapezoids (operator, pattern, dst,
src_x, src_y,
@@ -871,37 +881,27 @@
cairo_status_t
_cairo_surface_copy_page (cairo_surface_t *surface)
{
- cairo_int_status_t status;
-
if (surface->finished)
return CAIRO_STATUS_SURFACE_FINISHED;
- status = surface->backend->copy_page (surface);
/* It's fine if some backends just don't support this. */
- if (status == CAIRO_INT_STATUS_UNSUPPORTED)
+ if (surface->backend->copy_page == NULL)
return CAIRO_STATUS_SUCCESS;
- if (status)
- return status;
- return CAIRO_STATUS_SUCCESS;
+ return surface->backend->copy_page (surface);
}
cairo_status_t
_cairo_surface_show_page (cairo_surface_t *surface)
{
- cairo_int_status_t status;
-
if (surface->finished)
return CAIRO_STATUS_SURFACE_FINISHED;
- status = surface->backend->show_page (surface);
/* It's fine if some backends just don't support this. */
- if (status == CAIRO_INT_STATUS_UNSUPPORTED)
+ if (surface->backend->show_page == NULL)
return CAIRO_STATUS_SUCCESS;
- if (status)
- return status;
- return CAIRO_STATUS_SUCCESS;
+ return surface->backend->show_page (surface);
}
cairo_status_t
@@ -932,7 +932,7 @@
if (dst->finished)
return CAIRO_STATUS_SURFACE_FINISHED;
- if (dst->backend->show_glyphs != NULL)
+ if (dst->backend->show_glyphs)
status = dst->backend->show_glyphs (scaled_font, operator, pattern, dst,
source_x, source_y,
dest_x, dest_y,
Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cairo-win32-surface.c 7 Apr 2005 19:56:43 -0000 1.16
+++ cairo-win32-surface.c 7 Apr 2005 21:25:00 -0000 1.17
@@ -516,14 +516,6 @@
cairo_surface_destroy ((cairo_surface_t *)local);
}
-static cairo_status_t
-_cairo_win32_surface_clone_similar (void *surface,
- cairo_surface_t *src,
- cairo_surface_t **clone_out)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
static cairo_int_status_t
_cairo_win32_surface_composite (cairo_operator_t operator,
cairo_pattern_t *pattern,
@@ -672,35 +664,6 @@
}
static cairo_int_status_t
-_cairo_win32_surface_composite_trapezoids (cairo_operator_t operator,
- cairo_pattern_t *pattern,
- void *abstract_dst,
- int src_x,
- int src_y,
- int dst_x,
- int dst_y,
- unsigned int width,
- unsigned int height,
- cairo_trapezoid_t *traps,
- int num_traps)
-
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_win32_surface_copy_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_win32_surface_show_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
_cairo_win32_surface_set_clip_region (void *abstract_surface,
pixman_region16_t *region)
{
@@ -817,23 +780,6 @@
}
}
-static cairo_status_t
-_cairo_win32_surface_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
- cairo_pattern_t *pattern,
- void *abstract_surface,
- int source_x,
- int source_y,
- int dest_x,
- int dest_y,
- unsigned int width,
- unsigned int height,
- const cairo_glyph_t *glyphs,
- int num_glyphs)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
cairo_surface_t *
cairo_win32_surface_create (HDC hdc)
{
@@ -891,12 +837,12 @@
_cairo_win32_surface_release_source_image,
_cairo_win32_surface_acquire_dest_image,
_cairo_win32_surface_release_dest_image,
- _cairo_win32_surface_clone_similar,
+ NULL, /* clone_similar */
_cairo_win32_surface_composite,
_cairo_win32_surface_fill_rectangles,
- _cairo_win32_surface_composite_trapezoids,
- _cairo_win32_surface_copy_page,
- _cairo_win32_surface_show_page,
+ NULL, /* composite_trapezoids */
+ NULL, /* copy_page */
+ NULL, /* show_page */
_cairo_win32_surface_set_clip_region,
- _cairo_win32_surface_show_glyphs
+ NULL /* show_glyphs */
};
Index: cairo-xcb-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xcb-surface.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cairo-xcb-surface.c 4 Apr 2005 13:49:19 -0000 1.21
+++ cairo-xcb-surface.c 7 Apr 2005 21:25:00 -0000 1.22
@@ -841,22 +841,10 @@
}
static cairo_int_status_t
-_cairo_xcb_surface_copy_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_xcb_surface_show_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
_cairo_xcb_surface_set_clip_region (void *abstract_surface,
pixman_region16_t *region)
{
- /* FIXME */
+ /* XXX: FIXME */
return CAIRO_INT_STATUS_UNSUPPORTED;
}
@@ -871,8 +859,8 @@
_cairo_xcb_surface_composite,
_cairo_xcb_surface_fill_rectangles,
_cairo_xcb_surface_composite_trapezoids,
- _cairo_xcb_surface_copy_page,
- _cairo_xcb_surface_show_page,
+ NULL, /* copy_page */
+ NULL, /* show_page */
_cairo_xcb_surface_set_clip_region,
NULL /* show_glyphs */
};
Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- cairo-xlib-surface.c 7 Apr 2005 18:04:00 -0000 1.57
+++ cairo-xlib-surface.c 7 Apr 2005 21:25:00 -0000 1.58
@@ -783,18 +783,6 @@
}
static cairo_int_status_t
-_cairo_xlib_surface_copy_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
-_cairo_xlib_surface_show_page (void *abstract_surface)
-{
- return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_int_status_t
_cairo_xlib_surface_set_clip_region (void *abstract_surface,
pixman_region16_t *region)
{
@@ -872,8 +860,8 @@
_cairo_xlib_surface_composite,
_cairo_xlib_surface_fill_rectangles,
_cairo_xlib_surface_composite_trapezoids,
- _cairo_xlib_surface_copy_page,
- _cairo_xlib_surface_show_page,
+ NULL, /* copy_page */
+ NULL, /* show_page */
_cairo_xlib_surface_set_clip_region,
_cairo_xlib_surface_show_glyphs
};
More information about the cairo-commit
mailing list