openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-10 19:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Update to xserver 1.17.2. tested by dcoppa@, jsg@, jasper@ & naddy@

Browse Source
This commit is contained in:
matthieu
2015-09-16 19:10:19 +00:00
parent c10cac3b1e
commit 86ea9f12e2
761 changed files with 30813 additions and 28465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xserver/xfixes/region.c
View File

@@ -222,20 +222,13 @@ ProcXFixesCreateRegionFromGC(ClientPtr client)
if (rc != Success)
return rc;
switch (pGC->clientClipType) {
case CT_PIXMAP:
pRegion = BitmapToRegion(pGC->pScreen, (PixmapPtr) pGC->clientClip);
if (!pRegion)
return BadAlloc;
break;
case CT_REGION:
if (pGC->clientClip) {
pClip = (RegionPtr) pGC->clientClip;
pRegion = XFixesRegionCopy(pClip);
if (!pRegion)
return BadAlloc;
break;
default:
return BadImplementation; /* assume sane server bits */
} else {
return BadMatch;
}
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
@@ -272,20 +265,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))