summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-02-14 10:06:55 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-02-15 11:58:24 +1000
commit7b79a2e4a11b5c5f0ebaa495828725e235d2b08e (patch)
treef687e395c426942872cb8e0eaefe2ff2c87ef2e3 /fb
parent858d8b19b3a5bb59e5c5f9a9e68adce2495b5e31 (diff)
fb: drop two unneeded shadowing variables
fbpict.c: In function 'fbGlyphs': fbpict.c:188:6: warning: declaration of 'x' shadows a previous local [-Wshadow] fbpict.c:111:9: warning: shadowed declaration is here [-Wshadow] fbpict.c:188:9: warning: declaration of 'y' shadows a previous local [-Wshadow] fbpict.c:111:12: warning: shadowed declaration is here [-Wshadow] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Soren Sandmann <ssp@redhat.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Diffstat (limited to 'fb')
-rw-r--r--fb/fbpict.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 2804ff481..b50385805 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -185,19 +185,15 @@ fbGlyphs(CARD8 op,
if (maskFormat) {
pixman_format_code_t format;
pixman_box32_t extents;
- int x, y;
format = maskFormat->format | (maskFormat->depth << 24);
pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
- x = extents.x1;
- y = extents.y1;
-
pixman_composite_glyphs(op, srcImage, dstImage, format,
xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
- x, y,
- x + dstXoff, y + dstYoff,
+ extents.x1, extents.y1,
+ extents.x1 + dstXoff, extents.y1 + dstYoff,
extents.x2 - extents.x1,
extents.y2 - extents.y1,
glyphCache, n_glyphs, pglyphs);