summaryrefslogtreecommitdiff
path: root/xc/programs
diff options
context:
space:
mode:
authordpw <empty>1994-03-18 14:30:51 +0000
committerdpw <empty>1994-03-18 14:30:51 +0000
commit7650e7bf4fd34f82cc90e8a6b53403786ccb3755 (patch)
tree1886eb97a3fb699283c604116ee2c3cfc0d956fb /xc/programs
parentea77abbabaf534f9afe727be6faaa4063103bc38 (diff)
fix XBUG #5626: vestigial clip mask confuses GetScratchGC users
Diffstat (limited to 'xc/programs')
-rw-r--r--xc/programs/Xserver/dix/gc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xc/programs/Xserver/dix/gc.c b/xc/programs/Xserver/dix/gc.c
index 31ac53b4e..ed6dad6f8 100644
--- a/xc/programs/Xserver/dix/gc.c
+++ b/xc/programs/Xserver/dix/gc.c
@@ -22,7 +22,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: gc.c,v 5.24 93/09/20 16:48:08 dpw Exp $ */
+/* $XConsortium: gc.c,v 5.25 94/01/21 21:59:58 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
@@ -1194,7 +1194,8 @@ GetScratchGC(depth, pScreen)
pGC->graphicsExposures = FALSE;
pGC->clipOrg.x = 0;
pGC->clipOrg.y = 0;
- /* can't change clip type, because we might drop storage */
+ if (pGC->clientClipType != CT_NONE)
+ (*pGC->funcs->ChangeClip) (pGC, CT_NONE, NULL, 0);
pGC->stateChanges = (1 << GCLastBit+1) - 1;
return pGC;
}