[cairo-commit] 2 commits - boilerplate/cairo-boilerplate.c perf/cairo-stats.c test/mask-glyphs.c util/cairo-script

[Andrea Canciani]

 boilerplate/cairo-boilerplate.c          |    2 --
 perf/cairo-stats.c                       |    2 +-
 test/mask-glyphs.c                       |    2 --
 util/cairo-script/cairo-script-scanner.c |    2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 90b2fd34fbd8b13b0daea7780051546d1c603a33
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Nov 9 14:15:49 2011 +0100

    cairo-script: Don't ask for inlining of a cold-path function
    
    Silences a lot of warnings:
    
    inlining failed in call to 'scan_read.part.9': call is unlikely and
    code size would grow

diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c
index 969fb63..eeec686 100644
--- a/util/cairo-script/cairo-script-scanner.c
+++ b/util/cairo-script/cairo-script-scanner.c
@@ -768,7 +768,7 @@ base64_end (csi_t *ctx, csi_scanner_t *scan)
 	longjmp (scan->jmpbuf, status);
 }
 
-static inline void
+static void
 scan_read (csi_scanner_t *scan, csi_file_t *src, void *ptr, int len)
 {
     uint8_t *data = ptr;
commit f96e78fa546d5d9f5016fa30fb60ce5dcf9a0a8e
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Nov 9 13:56:50 2011 +0100

    Silence some 'unused var' warnings

diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 8e252f5..91abbe2 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -678,8 +678,6 @@ cairo_boilerplate_get_targets (int	    *pnum_targets,
 const cairo_boilerplate_target_t *
 cairo_boilerplate_get_image_target (cairo_content_t content)
 {
-    struct cairo_boilerplate_target_list *list;
-
     if (cairo_boilerplate_targets == NULL)
 	_cairo_boilerplate_register_all ();
 
diff --git a/perf/cairo-stats.c b/perf/cairo-stats.c
index 1e25aef..44ed038 100644
--- a/perf/cairo-stats.c
+++ b/perf/cairo-stats.c
@@ -32,7 +32,7 @@ _cairo_stats_compute (cairo_stats_t *stats,
 		      cairo_time_t  *values,
 		      int	     num_values)
 {
-    cairo_time_t sum, mean, delta, q1, q3, iqr;
+    cairo_time_t sum, mean, q1, q3, iqr;
     cairo_time_t outlier_min, outlier_max;
     int i, min_valid, num_valid;
     double s;
diff --git a/test/mask-glyphs.c b/test/mask-glyphs.c
index 9ac0272..2e7b703 100644
--- a/test/mask-glyphs.c
+++ b/test/mask-glyphs.c
@@ -43,13 +43,11 @@ _image_to_glyphs (cairo_surface_t *image,
 {
     int width, height, stride;
     const unsigned char *data;
-    cairo_format_t format;
     int x, y, z, n;
 
     width = cairo_image_surface_get_width (image);
     height = cairo_image_surface_get_height (image);
     stride = cairo_image_surface_get_stride (image);
-    format = cairo_image_surface_get_format (image);
     data = cairo_image_surface_get_data (image);
 
     n = 0;