[cairo] Compile failing in xcb backend

[James Cloos]

One last update.  I promise. :)

The directfb error was just a typo, so a pull from:

git://people.freedesktop.org/~cloos/cairo.git master

will now get these two changes:

commit cb1d05dd5e3a4bcdac08f6f75462b62831ce685b
Author:     James Cloos <cloos at jhcloos.com>
AuthorDate: Wed May 9 02:50:36 2007 -0400
Commit:     James Cloos <cloos at jhcloos.com>
CommitDate: Wed May 9 02:50:36 2007 -0400

    [cairo-directfb-surface] Fix typo from commit a8c8e17d
    Fix typo in name of _cairo_directfb_surface_is_similar().

diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index a7c9926..3dc3863 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -1512,7 +1512,7 @@ _cairo_directfb_surface_show_glyphs ( void                 *abstract_dst,
 
 
 static cairo_bool_t
-_cairo_directfb_surface_is_simlar (void *surface_a,
+_cairo_directfb_surface_is_similar (void *surface_a,
 	                           void *surface_b,
 				   cairo_content_t content)
 {

commit d3baedbc5204d14259054f8048945dff5da0ca6c
Author:     James Cloos <cloos at jhcloos.com>
AuthorDate: Wed May 9 02:25:57 2007 -0400
Commit:     James Cloos <cloos at jhcloos.com>
CommitDate: Wed May 9 02:25:57 2007 -0400

    [cairo-xcb-surface] Fix typos from commit a8c8e17d
    Make _cairo_xcb_surface_is_similar() compile.

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 304300a..385009c 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -1584,16 +1584,16 @@ _cairo_xcb_surface_is_similar (void *surface_a,
 {
     cairo_xcb_surface_t *a = surface_a;
     cairo_xcb_surface_t *b = surface_b;
-    xcb_render_pictforminfo_t xrender_format;
+    xcb_render_pictforminfo_t *xrender_format;
 
-    if (! _cairo_xcb_surface_same_screen (dst, src))
+    if (! _cairo_xcb_surface_same_screen (a, b))
 	return FALSE;
 
     /* now check that the target is a similar format */
     xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (b->dpy,
 	    _cairo_format_from_content (content));
 
-    return a->xrender_format == xrender_format;
+    return &a->xrender_format == xrender_format;
 }
 
 static cairo_status_t


-JimC
-- 
James Cloos <cloos at jhcloos.com>         OpenPGP: 1024D/ED7DAEA6