[cairo-commit] 2 commits - src/cairo-directfb-surface.c src/cairo-xcb-surface.c

[Chris Wilson]

 src/cairo-directfb-surface.c |    2 +-
 src/cairo-xcb-surface.c      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree b744c2705184c24845423d661258b39bbb17749b (from cbc9218cd3f664682bcb5095c602adf9615535d0)
Author: James Cloos <cloos at jhcloos.com>
Date:   Wed May 9 02:50:59 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 ( vo
 
 
 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)
 {
diff-tree cbc9218cd3f664682bcb5095c602adf9615535d0 (from 069514a10ff2ca9ac86cc3dc1703aa19caa538e2)
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 9 09:03:04 2007 +0100

    [cairo-xcb-surface] Fix compilation
    
    As spotted by James Cloos <cloos at jbcloos.com>, I broke the compilation...
    This is a minimal fix with no claims of completeness.

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 304300a..f929040 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -1584,16 +1584,16 @@ _cairo_xcb_surface_is_similar (void *sur
 {
     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.id == xrender_format->id;
 }
 
 static cairo_status_t