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

[Chris Wilson]

 src/cairo-script-surface.c |    2 +-
 src/cairo-xcb-connection.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b8051ee985ed46c69f5fba1216ead1ebacecfd44
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 19 18:09:27 2010 +0100

    script: Pass the buffer length back to freetype.
    
    After querying the required size, inform the backend of the allocated
    size of the buffer.

diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index d1c2816..407b716 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -2613,7 +2613,7 @@ _emit_type42_font (cairo_script_surface_t *surface,
     if (unlikely (buf == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    status = backend->load_truetype_table (scaled_font, 0, 0, buf, NULL);
+    status = backend->load_truetype_table (scaled_font, 0, 0, buf, &size);
     if (unlikely (status)) {
 	free (buf);
 	return status;
commit 8ac9a9df24eefc5f1125db87eb8eda2e94f54070
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 19 13:23:50 2010 +0100

    xcb: Return the status upon flushing the device.
    
    The vfunc was updated to expect the status return, so supply it.

diff --git a/src/cairo-xcb-connection.c b/src/cairo-xcb-connection.c
index 9da4eb3..0488390 100644
--- a/src/cairo-xcb-connection.c
+++ b/src/cairo-xcb-connection.c
@@ -468,7 +468,7 @@ _cairo_xcb_connection_query_dri2 (cairo_xcb_connection_t *connection)
 }
 #endif
 
-static void
+static cairo_status_t
 _device_flush (void *device)
 {
     cairo_xcb_connection_t *connection = device;
@@ -477,7 +477,7 @@ _device_flush (void *device)
 
     status = cairo_device_acquire (&connection->device);
     if (unlikely (status))
-	return;
+	return status;
 
     CAIRO_MUTEX_LOCK (connection->screens_mutex);
     cairo_list_foreach_entry (screen, cairo_xcb_screen_t,
@@ -491,6 +491,7 @@ _device_flush (void *device)
     xcb_flush (connection->xcb_connection);
 
     cairo_device_release (&connection->device);
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_bool_t