diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-09-23 08:24:06 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-09-23 08:24:06 +0200 |
| commit | 096f21bb7a1217443d8a03529b1a2938518eb24f (patch) | |
| tree | 6df1d363c36e65eeeafd0f555e6a564260395411 | |
| parent | 824a09d856a5f750694e11d2fd2faaa3de705eaa (diff) | |
EXA: Fix some issues pointed out by clang.
Remove dead variables, fix use of uninitialized values, that kind of thing.
| -rw-r--r-- | exa/exa_glyphs.c | 2 | ||||
| -rw-r--r-- | exa/exa_mixed.c | 4 | ||||
| -rw-r--r-- | exa/exa_render.c | 12 |
3 files changed, 8 insertions, 10 deletions
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index d621ccf76..bf097c32f 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -703,3 +703,2 @@ exaGlyphs (CARD8 op, { - PicturePtr pPicture; PixmapPtr pMaskPixmap = 0; @@ -805,3 +804,2 @@ exaGlyphs (CARD8 op, glyph = *glyphs++; - pPicture = GlyphPicture (glyph)[pScreen->myNum]; diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index 01f87ba87..6aa73f2b6 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -59,3 +59,3 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, int bpp; - size_t paddedWidth, datasize; + size_t paddedWidth; ExaScreenPriv(pScreen); @@ -81,4 +81,2 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, - datasize = h * paddedWidth; - /* We will allocate the system pixmap later if needed. */ diff --git a/exa/exa_render.c b/exa/exa_render.c index d46930130..1c1856610 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -268,2 +268,6 @@ exaTryDriverSolidFill(PicturePtr pSrc, yDst += pDst->pDrawable->y; + if (pSrc->pDrawable) { + xSrc += pSrc->pDrawable->x; + ySrc += pSrc->pDrawable->y; + } @@ -279,5 +283,2 @@ exaTryDriverSolidFill(PicturePtr pSrc, if (pSrc->pDrawable) { - xSrc += pSrc->pDrawable->x; - ySrc += pSrc->pDrawable->y; - pSrcPix = exaGetDrawablePixmap (pSrc->pDrawable); @@ -342,3 +343,4 @@ exaTryDriverCompositeRects(CARD8 op, ExaScreenPriv (pDst->pDrawable->pScreen); - int src_off_x, src_off_y, mask_off_x, mask_off_y, dst_off_x, dst_off_y; + int src_off_x = 0, src_off_y = 0, mask_off_x = 0, mask_off_y = 0; + int dst_off_x, dst_off_y; PixmapPtr pSrcPix = NULL, pMaskPix = NULL, pDstPix; @@ -658,3 +660,3 @@ exaTryDriverComposite(CARD8 op, (pSrcExaPix && pSrcExaPix->accel_blocked) || - (pMask && (pMaskExaPix->accel_blocked))) + (pMaskExaPix && (pMaskExaPix->accel_blocked))) { |