[cairo-commit] 2 commits - boilerplate/cairo-boilerplate-xlib.c perf/cairo-perf-diff

[Andrea Canciani]

 boilerplate/cairo-boilerplate-xlib.c |    6 ++++++
 perf/cairo-perf-diff                 |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e425c44e9c4c1796ccc3557a0368cf3b3a685a31
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Fri Apr 9 08:32:22 2010 +0200

    boilerplate: Compile xlib without xrender
    
    cairo_boilerplate_xlib_surface_disable_render() is not defined when
    compiling without XRender, but it was used nonetheless. Replace it
    with an empty stub when XRender is not available.

diff --git a/boilerplate/cairo-boilerplate-xlib.c b/boilerplate/cairo-boilerplate-xlib.c
index 61bdd5a..83280e9 100644
--- a/boilerplate/cairo-boilerplate-xlib.c
+++ b/boilerplate/cairo-boilerplate-xlib.c
@@ -269,6 +269,12 @@ cairo_boilerplate_xlib_surface_disable_render (cairo_surface_t *abstract_surface
 
     return CAIRO_STATUS_SUCCESS;
 }
+#else
+cairo_status_t
+cairo_boilerplate_xlib_surface_disable_render (cairo_surface_t *abstract_surface)
+{
+    return CAIRO_STATUS_SUCCESS;
+}
 #endif
 
 
commit 061ea78ad2838450b20d5550a7285823e0d24e1b
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Fri Apr 9 08:28:33 2010 +0200

    perf: Correct cairo-perf-diff syntax
    
    { cmd-list; } seems to literally be the required syntax. Blanks and
    ';' are both mandatory.

diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff
index 5700cf2..5a4b7b3 100755
--- a/perf/cairo-perf-diff
+++ b/perf/cairo-perf-diff
@@ -214,7 +214,7 @@ run_cairo_perf_if_not_cached() {
     }
 
     echo "Running \"cairo-perf $CAIRO_PERF_OPTIONS\" against $rev. Results will be cached in:"
-    {./$benchmark $CAIRO_PERF_OPTIONS || echo "*** Performance test crashed"} >> $perf
+    { ./$benchmark $CAIRO_PERF_OPTIONS || echo "*** Performance test crashed"; } >> $perf
 
     cd $owd
 }