[Commit] cairo/src cairo_surface.c,1.7,1.8

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/cairo/src
In directory home.keithp.com:/tmp/cvs-serv7333/src

Modified Files:
	cairo_surface.c 
Log Message:
Force explicit dependency on Xrender >= 0.6.
Make _cairo_x11_surface_put_image static.

Index: cairo_surface.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_surface.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cairo_surface.c	15 Sep 2003 14:29:45 -0000	1.7
+++ cairo_surface.c	15 Sep 2003 20:17:33 -0000	1.8
@@ -355,12 +355,12 @@
     surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL);
 }
 
-cairo_status_t
-cairo_x11_surface_put_image (cairo_surface_t       *surface,
-                        char                   *data,
-                        int                    width,
-                        int                    height,
-                        int                    stride)
+static cairo_status_t
+_cairo_x11_surface_put_image (cairo_surface_t       *surface,
+			      char                   *data,
+			      int                    width,
+			      int                    height,
+			      int                    stride)
 {
     if (surface->picture) {
 	XImage *image;
@@ -629,11 +629,11 @@
 	    cairo_surface_get_matrix (src, &matrix);
 	    cairo_surface_set_matrix (src_on_server, &matrix);
 
-	    cairo_x11_surface_put_image (src_on_server,
-					 (char *) IcImageGetData (src->icimage),
-					 IcImageGetWidth (src->icimage),
-					 IcImageGetHeight (src->icimage),
-					 IcImageGetStride (src->icimage));
+	    _cairo_x11_surface_put_image (src_on_server,
+					  (char *) IcImageGetData (src->icimage),
+					  IcImageGetWidth (src->icimage),
+					  IcImageGetHeight (src->icimage),
+					  IcImageGetStride (src->icimage));
 	}
 
 	XRenderComposite (dst->dpy, operator,