[cairo-commit] cairo/src cairo.c,1.22,1.23 cairo.h,1.20,1.21 cairo_ft_font.c,1.1,1.2 cairo_xlib_surface.c,1.4,1.5

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo.c cairo.h cairo_ft_font.c cairo_xlib_surface.c 
Log Message:
Fixes to eliminate a few compiler warnings.
Bump version to 0.1.8 for recent font API changes.

Index: cairo.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** cairo.c	23 Oct 2003 22:22:28 -0000	1.22
--- cairo.c	24 Oct 2003 18:01:37 -0000	1.23
***************
*** 609,613 ****
  {
      if (cr->status)
! 	return;
  
      cairo_font_t *ret;  
--- 609,613 ----
  {
      if (cr->status)
! 	return NULL;
  
      cairo_font_t *ret;  
***************
*** 655,658 ****
--- 655,659 ----
  
  
+ /* XXX: NYI
  void
  cairo_text_extents (cairo_t                *cr,
***************
*** 678,681 ****
--- 679,683 ----
  					      extents);
  }
+ */
  
  void
***************
*** 697,700 ****
--- 699,703 ----
  }
  
+ /* XXX: NYI
  void
  cairo_text_path  (cairo_t *cr, const unsigned char *utf8)
***************
*** 714,718 ****
      cr->status = _cairo_gstate_glyph_path (cr->gstate, glyphs, num_glyphs);  
  }
! 
  
  void
--- 717,721 ----
      cr->status = _cairo_gstate_glyph_path (cr->gstate, glyphs, num_glyphs);  
  }
! */
  
  void

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** cairo.h	23 Oct 2003 22:22:28 -0000	1.20
--- cairo.h	24 Oct 2003 18:01:37 -0000	1.21
***************
*** 390,394 ****
  
  
! /* NYI
  
  extern void __external_linkage
--- 390,394 ----
  
  
! /* XXX: NYI
  
  extern void __external_linkage

Index: cairo_ft_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_ft_font.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cairo_ft_font.c	23 Oct 2003 22:27:40 -0000	1.1
--- cairo_ft_font.c	24 Oct 2003 18:01:37 -0000	1.2
***************
*** 43,47 ****
  
  static FT_Library _cairo_ft_lib = NULL;
! static int _init_cairo_ft_lib ()
  {
      if (_cairo_ft_lib != NULL)
--- 43,48 ----
  
  static FT_Library _cairo_ft_lib = NULL;
! static int
! _init_cairo_ft_lib (void)
  {
      if (_cairo_ft_lib != NULL)
***************
*** 191,197 ****
      cairo_ft_font_t * ft_font = NULL;
    
-     if (font == NULL)
-         return;
- 
      ft_font = (cairo_ft_font_t *)font;
  
--- 192,195 ----
***************
*** 311,318 ****
  
  
! int _utf8_to_glyphs (cairo_font_t        *font,
!                      const unsigned char *utf8,
!                      cairo_glyph_t       **glyphs,
!                      size_t              *nglyphs)
  {
      cairo_ft_font_t *ft;
--- 309,317 ----
  
  
! static int
! _utf8_to_glyphs (cairo_font_t        *font,
! 		 const unsigned char *utf8,
! 		 cairo_glyph_t       **glyphs,
! 		 size_t              *nglyphs)
  {
      cairo_ft_font_t *ft;
***************
*** 385,391 ****
      cairo_status_t status = CAIRO_STATUS_SUCCESS;
  
-     if (font == NULL)
-         return;
- 
      ft = (cairo_ft_font_t *)font;
  
--- 384,387 ----
***************
*** 512,518 ****
      cairo_ft_font_t *ft;
      
-     if (font == NULL)
-         return;
-     
      ft = (cairo_ft_font_t *)font;
      
--- 508,511 ----

Index: cairo_xlib_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_xlib_surface.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cairo_xlib_surface.c	23 Oct 2003 22:22:29 -0000	1.4
--- cairo_xlib_surface.c	24 Oct 2003 18:01:37 -0000	1.5
***************
*** 464,476 ****
  };
  
- static Picture
- _cairo_xlib_surface_get_picture (cairo_surface_t *surface)
- {
-     if (surface->backend != &cairo_xlib_surface_backend)
- 	return 0;
- 
-     return ((cairo_xlib_surface *) surface)->picture;
- }
- 
  cairo_surface_t *
  cairo_xlib_surface_create (Display		*dpy,
--- 464,467 ----