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

[Chris Wilson]

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

New commits:
commit 77e60df32fa59328bd32095c77f8c360805b5db7
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Sat Nov 8 15:29:40 2008 +0100

    cairo-xcb: avoid leaking memory

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index dede00f..9b7eb4b 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -2416,6 +2416,9 @@ _cairo_xcb_surface_emit_glyphs (cairo_xcb_surface_t *dst,
 	}
     }
 
+    /* We wouldn't want to leak memory, would we? */
+    free(output_glyphs);
+
     return CAIRO_STATUS_SUCCESS;
 }
 
commit 361962b7fb4385f164673991670b6fce0839d32a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 31 08:42:30 2008 +0000

    [directfb] Compile fix with debug enabled.
    
    Fix a trivial compile failure reported here:
      Bug 18322 - bug in _cairo_directfb_surface_release_source_image function
      (http://bugs.freedesktop.org/show_bug.cgi?id=18322)

diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index aa67b02..bb02dbf 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -549,6 +549,7 @@ _cairo_directfb_surface_release_source_image (void                  *abstract_su
                                               cairo_image_surface_t *image,
                                               void                  *image_extra)
 {
+    cairo_directfb_surface_t *surface = abstract_surface;
     IDirectFBSurface *buffer = image_extra;
 
     D_DEBUG_AT (CairoDFB_Acquire,