[cairo-commit] cairo/src cairo-win32-font.c, 1.10, 1.11 cairo-win32-surface.c, 1.12, 1.13

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv31678/src

Modified Files:
	cairo-win32-font.c cairo-win32-surface.c 
Log Message:

        A few fixes courtesy of Jason Dorje Short <jdorje at users.sf.net>:

        * configure.in: Disable PS backend if zlib is not found.

        * src/cairo-win32-font.c: (_cairo_win32_font_glyph_path): Fix
        mistyped parameter.

        * src/cairo-win32-surface.c: (_cairo_win32_surface_finish): Fix
        missing return value.


Index: cairo-win32-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-font.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cairo-win32-font.c	17 Mar 2005 21:27:26 -0000	1.10
+++ cairo-win32-font.c	30 Mar 2005 21:34:51 -0000	1.11
@@ -1104,7 +1104,7 @@
 _cairo_win32_font_glyph_path (void			*abstract_font,
 			      cairo_glyph_t		*glyphs, 
 			      int			num_glyphs,
-			      cairo_path_t		*path)
+			      cairo_path_fixed_t	*path)
 {
     return CAIRO_STATUS_SUCCESS;
 }

Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cairo-win32-surface.c	23 Mar 2005 21:49:33 -0000	1.12
+++ cairo-win32-surface.c	30 Mar 2005 21:34:51 -0000	1.13
@@ -324,7 +324,7 @@
 					       width, height);
 }
 
-static void
+static cairo_status_t
 _cairo_win32_surface_finish (void *abstract_surface)
 {
     cairo_win32_surface_t *surface = abstract_surface;
@@ -341,6 +341,8 @@
   	DeleteObject (surface->bitmap);
         DeleteDC (surface->dc);
     }
+
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static double