diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-20 15:21:31 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-20 15:31:44 -0500 |
| commit | fae39db7957c0ebdc7af36f8d8f484473beb6d38 (patch) | |
| tree | 29cc5ca6f10252f1731ec486e8c984d6ef4e3be5 /mfb | |
| parent | 709c1a70c8c6a9e132bf0d92f78a12be72beee51 (diff) | |
devPrivates rework: put back some changes that were mistakenly removed
during merge conflict resolution.
Diffstat (limited to 'mfb')
| -rw-r--r-- | mfb/mfbbitblt.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 0c23ba750..344c655ee 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -399,22 +399,20 @@ int dstx, dsty; static DevPrivateKey copyPlaneScreenKey = ©PlaneScreenKey; -typedef RegionPtr (*CopyPlaneFuncPtr)( - DrawablePtr /* pSrcDrawable */, - DrawablePtr /* pDstDrawable */, - GCPtr /* pGC */, - int /* srcx */, - int /* srcy */, - int /* width */, - int /* height */, - int /* dstx */, - int /* dsty */, - unsigned long /* bitPlane */); - Bool mfbRegisterCopyPlaneProc (pScreen, proc) ScreenPtr pScreen; - CopyPlaneFuncPtr proc; + RegionPtr (*proc)( + DrawablePtr /* pSrcDrawable */, + DrawablePtr /* pDstDrawable */, + GCPtr /* pGC */, + int /* srcx */, + int /* srcy */, + int /* width */, + int /* height */, + int /* dstx */, + int /* dsty */, + unsigned long /* bitPlane */); { dixSetPrivate(&pScreen->devPrivates, copyPlaneScreenKey, proc); return TRUE; @@ -461,10 +459,8 @@ unsigned long plane; if (pSrcDrawable->depth != 1) { - if ((copyPlane = (CopyPlaneFuncPtr) - dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates, - copyPlaneScreenKey)) - ) + if ((copyPlane = dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates, + copyPlaneScreenKey))) { return (*copyPlane) (pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height, dstx, dsty, plane); |