diff options
| author | Ville Syrjälä <ville.syrjala@nokia.com> | 2010-12-20 16:33:36 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@nokia.com> | 2011-05-04 19:01:01 +0300 |
| commit | ce9eff9e4c30deb16f059ed84b436d37da45d5d5 (patch) | |
| tree | 1fa3f63310a1b21ef03ba717052241a09e44dae6 | |
| parent | 5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3 (diff) | |
composite: Call ValidateGC after ChangeGC
ChangeGC changes the GC, so ValidateGC should be called after it, not
before.
Also pass NullClient instead of serverClient to ChangeGC() since we
know the changed values to be valid, and setting
serverClient->errorValue seems pointless anyway.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | composite/compalloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/composite/compalloc.c b/composite/compalloc.c index 7164c0d3c..2b6864519 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -536,9 +536,8 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) { ChangeGCVal val; val.val = IncludeInferiors; - + ChangeGC (NullClient, pGC, GCSubwindowMode, &val); ValidateGC(&pPixmap->drawable, pGC); - ChangeGC (serverClient, pGC, GCSubwindowMode, &val); (*pGC->ops->CopyArea) (&pParent->drawable, &pPixmap->drawable, pGC, |