From 46d79228df5c5fda114e68d3df02eaa33b5a41c9 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 11 Aug 2012 17:48:17 +0100 Subject: [PATCH] xlib: Silence compiler warning cairo-xlib-display.c: In function '_cairo_xlib_display_get_xrender_format': cairo-xlib-display.c:519:21: warning: 'pict_format' may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Chris Wilson --- src/cairo-xlib-display.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c index e685c7cd8..d806bfd50 100644 --- a/src/cairo-xlib-display.c +++ b/src/cairo-xlib-display.c @@ -492,7 +492,7 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t *display, xrender_format = display->cached_xrender_formats[format]; if (xrender_format == NULL) { - int pict_format; + int pict_format = 0; switch (format) { case CAIRO_FORMAT_A1: @@ -515,9 +515,10 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t *display, case CAIRO_FORMAT_ARGB32: pict_format = PictStandardARGB32; break; } - if (!xrender_format) - xrender_format = XRenderFindStandardFormat (display->display, - pict_format); + if (pict_format) { + xrender_format = + XRenderFindStandardFormat (display->display, pict_format); + } display->cached_xrender_formats[format] = xrender_format; }