diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-06-05 20:55:29 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-05 22:07:21 -0700 |
| commit | a0fe6987b55b5326157b50e169b8d6b9ae26a1ae (patch) | |
| tree | 30bd5b4a9fef3d1435059bb2a32d4e8d9916195c /render | |
| parent | 424b593c7872a703d3d0c942b7e8acc0770eb023 (diff) | |
Clean up after removal of screen parameters from region macros.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'render')
| -rw-r--r-- | render/mirect.c | 3 | ||||
| -rw-r--r-- | render/picture.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/render/mirect.c b/render/mirect.c index 6a3112a09..4fb347a93 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -42,7 +42,6 @@ miColorRects (PicturePtr pDst, int xoff, int yoff) { - ScreenPtr pScreen = pDst->pDrawable->pScreen; CARD32 pixel; GCPtr pGC; ChangeGCVal tmpval[5]; @@ -51,7 +50,7 @@ miColorRects (PicturePtr pDst, miRenderColorToPixel (pDst->pFormat, color, &pixel); - pGC = GetScratchGC (pDst->pDrawable->depth, pScreen); + pGC = GetScratchGC (pDst->pDrawable->depth, pDst->pDrawable->pScreen); if (!pGC) return; tmpval[0].val = GXcopy; diff --git a/render/picture.c b/render/picture.c index f6e3a9e08..f55711d48 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1300,8 +1300,7 @@ SetPictureClipRects (PicturePtr pPicture, RegionPtr clientClip; int result; - clientClip = RegionFromRects( - nRect, rects, CT_UNSORTED); + clientClip = RegionFromRects(nRect, rects, CT_UNSORTED); if (!clientClip) return BadAlloc; result =(*ps->ChangePictureClip) (pPicture, CT_REGION, @@ -1331,9 +1330,8 @@ SetPictureClipRegion (PicturePtr pPicture, if (pRegion) { type = CT_REGION; - clientClip = RegionCreate( - RegionExtents(pRegion), - RegionNumRects(pRegion)); + clientClip = RegionCreate(RegionExtents(pRegion), + RegionNumRects(pRegion)); if (!clientClip) return BadAlloc; if (!RegionCopy(clientClip, pRegion)) |