diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-21 17:36:36 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-23 09:52:10 +0200 |
| commit | 434be47f12c390659bf0dabd8ebea8ea37f8f26a (patch) | |
| tree | 17a1d4514989d8aa53cf6e7fb0714ebfcb2752af /tests/testdisplay.c | |
| parent | 4c9abd5aa460572899c4890fcc833d57ee025073 (diff) | |
shut up the compiler a bit
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/testdisplay.c')
| -rw-r--r-- | tests/testdisplay.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/testdisplay.c b/tests/testdisplay.c index dc087f89..5b992696 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -335,7 +335,7 @@ paint_color_key(void) } static void -paint_output_info(cairo_t *cr, int width, int height, void *priv) +paint_output_info(cairo_t *cr, int l_width, int l_height, void *priv) { struct connector *c = priv; cairo_text_extents_t name_extents, mode_extents; @@ -358,9 +358,9 @@ paint_output_info(cairo_t *cr, int width, int height, void *priv) cairo_text_extents(cr, mode_buf, &mode_extents); /* Paint output name */ - x = width / 2; + x = l_width / 2; x -= name_extents.width / 2; - y = height / 2; + y = l_height / 2; y -= (name_extents.height / 2) - (mode_extents.height / 2) - 10; cairo_set_font_size(cr, 48); cairo_move_to(cr, x, y); @@ -371,10 +371,10 @@ paint_output_info(cairo_t *cr, int width, int height, void *priv) cairo_fill(cr); /* Paint mode name */ - x = width / 2; + x = l_width / 2; x -= mode_extents.width / 2; modes_x = x; - y = height / 2; + y = l_height / 2; y += (mode_extents.height / 2) + (name_extents.height / 2) + 10; cairo_set_font_size(cr, 36); cairo_move_to(cr, x, y); @@ -424,7 +424,7 @@ paint_output_info(cairo_t *cr, int width, int height, void *priv) static void set_mode(struct connector *c) { - unsigned int fb_id; + unsigned int fb_id = 0; int j, test_mode_num; if (depth <= 8) |