[cairo-commit] cairo/src cairo-font.c, 1.43, 1.44 cairo.h, 1.96, 1.97 cairoint.h, 1.124, 1.125

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-font.c cairo.h cairoint.h 
Log Message:

        * src/cairoint.h:
        * src/cairo.h: Move include of pixman.h from cairo.h to cairoint.h
        since libpixman isn't part of cairo's public interface.

        * test/move-to-show-surface.c (draw): Use unsigned long rather
        than uint32_t since we no longer have pixman.h setting that type
        up for us.

        * src/cairo-font.c (cairo_font_face_destroy): Remove unused
        variable user_data_copy.


Index: cairo-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- cairo-font.c	8 Apr 2005 20:14:17 -0000	1.43
+++ cairo-font.c	8 Apr 2005 21:06:32 -0000	1.44
@@ -76,8 +76,6 @@
 void
 cairo_font_face_destroy (cairo_font_face_t *font_face)
 {
-    cairo_user_data_array_t user_data_copy;
-  
     if (--(font_face->refcount) > 0)
 	return;
 

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- cairo.h	8 Apr 2005 20:14:17 -0000	1.96
+++ cairo.h	8 Apr 2005 21:06:32 -0000	1.97
@@ -46,7 +46,6 @@
 #endif
 
 #include <cairo-features.h>
-#include <pixman.h>
 
 CAIRO_BEGIN_DECLS
 

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- cairoint.h	8 Apr 2005 20:14:17 -0000	1.124
+++ cairoint.h	8 Apr 2005 21:06:32 -0000	1.125
@@ -61,6 +61,7 @@
 #include <stdio.h>
 
 #include "cairo.h"
+#include <pixman.h>
 
 #if __GNUC__ >= 3 && defined(__ELF__)
 # define slim_hidden_proto(name)	slim_hidden_proto1(name, INT_##name)