[cairo-commit] cairo/src cairo_xcb_surface.c, 1.2, 1.3 cairo_ps_surface.c, 1.7, 1.8 cairo_png_surface.c, 1.1, 1.2 cairo.h, 1.48, 1.49

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv32078/src

Modified Files:
	cairo_xcb_surface.c cairo_ps_surface.c cairo_png_surface.c 
	cairo.h 
Log Message:
2004-03-23  Olivier Andrieu  <oliv__a at users.sourceforge.net>
	
	* src/cairo_ps_surface.c (_cairo_ps_surface_set_clip_region)
	* src/cairo_png_surface.c (_cairo_png_surface_set_clip_region):
	Implement _set_clip_region by delegating it to the image backend.

	* src/cairo_xcb_surface.c (_cairo_xcb_surface_set_clip_region):
	Add a stub.

	* src/cairo.h: Add missing (?) cairo_init_clip


Index: cairo_xcb_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_xcb_surface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** a/cairo_xcb_surface.c	17 Mar 2004 17:44:26 -0000	1.2
--- b/cairo_xcb_surface.c	23 Mar 2004 18:33:32 -0000	1.3
***************
*** 705,708 ****
--- 705,716 ----
  }
  
+ static cairo_int_status_t
+ _cairo_xcb_surface_set_clip_region (void *abstract_surface,
+ 				    pixman_region16_t *region)
+ {
+     /* FIXME */
+     return CAIRO_INT_STATUS_UNSUPPORTED;
+ }
+ 
  static const struct cairo_surface_backend cairo_xcb_surface_backend = {
      _cairo_xcb_surface_create_similar,
***************
*** 718,722 ****
      _cairo_xcb_surface_composite_trapezoids,
      _cairo_xcb_surface_copy_page,
!     _cairo_xcb_surface_show_page
  };
  
--- 726,731 ----
      _cairo_xcb_surface_composite_trapezoids,
      _cairo_xcb_surface_copy_page,
!     _cairo_xcb_surface_show_page,
!     _cairo_xcb_surface_set_clip_region
  };
  

Index: cairo_ps_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_ps_surface.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** a/cairo_ps_surface.c	19 Mar 2004 23:47:25 -0000	1.7
--- b/cairo_ps_surface.c	23 Mar 2004 18:33:32 -0000	1.8
***************
*** 399,404 ****
  				   pixman_region16_t *region)
  {
!     /* FIXME: I don't really understand this backend. */
!     return CAIRO_STATUS_SUCCESS;
  }
  
--- 399,405 ----
  				   pixman_region16_t *region)
  {
!     cairo_ps_surface_t *surface = abstract_surface;
! 
!     return _cairo_image_surface_set_clip_region (surface->image, region);
  }
  

Index: cairo_png_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_png_surface.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** a/cairo_png_surface.c	24 Feb 2004 20:28:49 -0000	1.1
--- b/cairo_png_surface.c	23 Mar 2004 18:33:32 -0000	1.2
***************
*** 298,301 ****
--- 298,311 ----
  }
  
+ static cairo_int_status_t
+ _cairo_png_surface_set_clip_region (void *abstract_surface,
+ 				    pixman_region16_t *region)
+ {
+     cairo_png_surface_t *surface = abstract_surface;
+ 
+     return _cairo_image_surface_set_clip_region (surface->image, region);
+ }
+ 
+ 
  static const cairo_surface_backend_t cairo_png_surface_backend = {
      _cairo_png_surface_create_similar,
***************
*** 311,314 ****
      _cairo_png_surface_composite_trapezoids,
      _cairo_png_surface_copy_page,
!     _cairo_png_surface_show_page
  };
--- 321,325 ----
      _cairo_png_surface_composite_trapezoids,
      _cairo_png_surface_copy_page,
!     _cairo_png_surface_show_page,
!     _cairo_png_surface_set_clip_region
  };

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** a/cairo.h	17 Mar 2004 17:44:26 -0000	1.48
--- b/cairo.h	23 Mar 2004 18:33:32 -0000	1.49
***************
*** 356,359 ****
--- 356,362 ----
  /* Clipping */
  void
+ cairo_init_clip (cairo_t *cr);
+ 
+ void
  cairo_clip (cairo_t *cr);