diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-25 19:53:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-25 19:53:22 +0200 |
| commit | d6d5581d5fba846c8476ad4d593da662306765d7 (patch) | |
| tree | 7a864e15d2c5007b7c3298487a59f11f15c55c75 /xorg-server/xfixes | |
| parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
| download | vcxsrv-d6d5581d5fba846c8476ad4d593da662306765d7.tar.gz vcxsrv-d6d5581d5fba846c8476ad4d593da662306765d7.tar.bz2 vcxsrv-d6d5581d5fba846c8476ad4d593da662306765d7.zip | |
libXft mesa xserver pixman xkeyboard-config git update 25 Oct 2014
xserver commit 16a32c53f6e9ad1f3284d4596edfa33e9efb740e
xkeyboard-config commit 0d4c3d9d891536aa1ec4f1fff5e3df51cfd2718d
pixman commit 594e6a6c93e92fcfb495e987aec5617f6c37f467
libXft commit e8a83226bc10afb587f6f34daac44d2ef809c85e
mesa commit 13862812dc910a4ef57cb72cb9fe777ce3c14515
Diffstat (limited to 'xorg-server/xfixes')
| -rw-r--r-- | xorg-server/xfixes/region.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c index f9de52542..4cfeee1a1 100644 --- a/xorg-server/xfixes/region.c +++ b/xorg-server/xfixes/region.c @@ -272,20 +272,12 @@ ProcXFixesCreateRegionFromPicture(ClientPtr client) if (!pPicture->pDrawable) return RenderErrBase + BadPicture; - switch (pPicture->clientClipType) { - case CT_PIXMAP: - pRegion = BitmapToRegion(pPicture->pDrawable->pScreen, - (PixmapPtr) pPicture->clientClip); - if (!pRegion) - return BadAlloc; - break; - case CT_REGION: + if (pPicture->clientClip) { pRegion = XFixesRegionCopy((RegionPtr) pPicture->clientClip); if (!pRegion) return BadAlloc; - break; - default: - return BadImplementation; /* assume sane server bits */ + } else { + return BadMatch; } if (!AddResource(stuff->region, RegionResType, (void *) pRegion)) |