[cairo-commit] cairo/src cairo_gstate.c, 1.46, 1.47 cairo_surface.c, 1.27, 1.28 cairoint.h, 1.57, 1.58

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo_gstate.c cairo_surface.c cairoint.h 
Log Message:

        * src/cairoint.h:
        * src/cairo_surface.c (_cairo_surface_composite):
        * src/cairo_gstate.c (_cairo_gstate_current_fill_rule): Fixed
        several function prototype mismatches between internal header file
        and implementation (thanks to Carlos Romero and gcc-3.4).


Index: cairo_gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_gstate.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** a/cairo_gstate.c	22 Apr 2004 09:22:36 -0000	1.46
--- b/cairo_gstate.c	23 Apr 2004 17:08:53 -0000	1.47
***************
*** 453,457 ****
  }
  
! cairo_status_t
  _cairo_gstate_current_fill_rule (cairo_gstate_t *gstate)
  {
--- 453,457 ----
  }
  
! cairo_fill_rule_t
  _cairo_gstate_current_fill_rule (cairo_gstate_t *gstate)
  {

Index: cairo_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_surface.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** a/cairo_surface.c	22 Apr 2004 09:22:36 -0000	1.27
--- b/cairo_surface.c	23 Apr 2004 17:08:53 -0000	1.28
***************
*** 204,208 ****
  slim_hidden_def(cairo_surface_set_repeat);
  
! cairo_int_status_t
  _cairo_surface_composite (cairo_operator_t	operator,
  			  cairo_surface_t	*src,
--- 204,208 ----
  slim_hidden_def(cairo_surface_set_repeat);
  
! cairo_status_t
  _cairo_surface_composite (cairo_operator_t	operator,
  			  cairo_surface_t	*src,

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** a/cairoint.h	22 Apr 2004 09:22:36 -0000	1.57
--- b/cairoint.h	23 Apr 2004 17:08:53 -0000	1.58
***************
*** 929,933 ****
  		    cairo_font_weight_t  weight);
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_init (cairo_font_t *font, 
  		  const struct cairo_font_backend *backend);
--- 929,933 ----
  		    cairo_font_weight_t  weight);
  
! extern cairo_status_t __internal_linkage
  _cairo_font_init (cairo_font_t *font, 
  		  const struct cairo_font_backend *backend);
***************
*** 942,955 ****
  _cairo_font_transform (cairo_font_t *font, cairo_matrix_t *matrix);
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_font_extents (cairo_font_t *font, 
  			  cairo_font_extents_t *extents);
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_text_extents (cairo_font_t *font,
                            const unsigned char *utf8,
  			  cairo_text_extents_t *extents);
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_glyph_extents (cairo_font_t *font,
                             cairo_glyph_t *glyphs,
--- 942,955 ----
  _cairo_font_transform (cairo_font_t *font, cairo_matrix_t *matrix);
  
! extern cairo_status_t __internal_linkage
  _cairo_font_font_extents (cairo_font_t *font, 
  			  cairo_font_extents_t *extents);
  
! extern cairo_status_t __internal_linkage
  _cairo_font_text_extents (cairo_font_t *font,
                            const unsigned char *utf8,
  			  cairo_text_extents_t *extents);
  
! extern cairo_status_t __internal_linkage
  _cairo_font_glyph_extents (cairo_font_t *font,
                             cairo_glyph_t *glyphs,
***************
*** 957,961 ****
  			   cairo_text_extents_t *extents);
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_show_text (cairo_font_t             *font,
                         cairo_operator_t         operator,
--- 957,961 ----
  			   cairo_text_extents_t *extents);
  
! extern cairo_status_t __internal_linkage
  _cairo_font_show_text (cairo_font_t             *font,
                         cairo_operator_t         operator,
***************
*** 967,971 ****
  
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_show_glyphs (cairo_font_t           *font,
                           cairo_operator_t       operator,
--- 967,971 ----
  
  
! extern cairo_status_t __internal_linkage
  _cairo_font_show_glyphs (cairo_font_t           *font,
                           cairo_operator_t       operator,
***************
*** 976,980 ****
  
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_text_path (cairo_font_t             *font,
  		       double			x,
--- 976,980 ----
  
  
! extern cairo_status_t __internal_linkage
  _cairo_font_text_path (cairo_font_t             *font,
  		       double			x,
***************
*** 983,987 ****
                         cairo_path_t             *path);
  
! extern cairo_int_status_t __internal_linkage
  _cairo_font_glyph_path (cairo_font_t            *font,
                          cairo_glyph_t           *glyphs, 
--- 983,987 ----
                         cairo_path_t             *path);
  
! extern cairo_status_t __internal_linkage
  _cairo_font_glyph_path (cairo_font_t            *font,
                          cairo_glyph_t           *glyphs,