diff options
| author | Uli Schlachter <psychon@znc.in> | 2013-09-27 15:37:08 +0200 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2014-08-27 10:53:03 +0200 |
| commit | c553424a1da2593daffa07a3dbf60ee6489c2a67 (patch) | |
| tree | 9efa6a761011abfac24ce53f5158f84562a5a53d | |
| parent | 549129e306bef2f81f53a52904af8814e79e1440 (diff) | |
| download | cairo-c553424a1da2593daffa07a3dbf60ee6489c2a67.tar.gz | |
fill_reduces_to_source(): Handle failure of color_to_pixel()
The function color_to_pixel() can fail for unsupported pixman image formats, but
fill_reduces_to_source() ignored this possibility.
Fix this by using the return value of color_to_pixel():
Fixes the following compiler warnings:
cairo-image-compositor.c: In function 'fill_boxes':
cairo-image-compositor.c:349:15: warning: 'pixel' may be used uninitialized in this function [-Wmaybe-uninitialized]
cairo-image-compositor.c: In function 'fill_rectangles':
cairo-image-compositor.c:304:18: warning: 'pixel' may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: Uli Schlachter <psychon@znc.in>
| -rw-r--r-- | src/cairo-image-compositor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c index d0c4dd971..0f478141e 100644 --- a/src/cairo-image-compositor.c +++ b/src/cairo-image-compositor.c @@ -279,8 +279,7 @@ fill_reduces_to_source (cairo_operator_t op, uint32_t *pixel) { if (__fill_reduces_to_source (op, color, dst)) { - color_to_pixel (color, dst->pixman_format, pixel); - return TRUE; + return color_to_pixel (color, dst->pixman_format, pixel); } return FALSE; |