diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-06-20 13:31:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-27 15:46:05 -0400 |
| commit | 73e2383b7350723256894c5076d0c731aec5cd1f (patch) | |
| tree | 1ceac2d3dbec5820802ce3be12fac72b754cce20 /mi/micopy.c | |
| parent | e7b9295551d55b42b416ba70cce11dae79ece5e7 (diff) | |
dix: Always store GC client clip as a region (v2)
Again, this changes FixesCreateRegionFromGC to throw BadMatch when fed a
GC with no client clip.
v2: Fix Xnest and some variable names (Keith)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'mi/micopy.c')
| -rw-r--r-- | mi/micopy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mi/micopy.c b/mi/micopy.c index a52b0a786..2409c7880 100644 --- a/mi/micopy.c +++ b/mi/micopy.c @@ -167,7 +167,7 @@ miDoCopy(DrawablePtr pSrcDrawable, /* Compute source clip region */ if (pSrcDrawable->type == DRAWABLE_PIXMAP) { - if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE)) + if ((pSrcDrawable == pDstDrawable) && (!pGC->clientClip)) prgnSrcClip = miGetCompositeClip(pGC); else fastSrc = TRUE; @@ -186,8 +186,7 @@ miDoCopy(DrawablePtr pSrcDrawable, */ fastSrc = TRUE; } - else if ((pSrcDrawable == pDstDrawable) && - (pGC->clientClipType == CT_NONE)) { + else if ((pSrcDrawable == pDstDrawable) && (!pGC->clientClip)) { prgnSrcClip = miGetCompositeClip(pGC); } else { |