diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
| commit | 6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (patch) | |
| tree | fd434665398565d3bb9c68b97c978b63a7756add /xorg-server/render/picture.c | |
| parent | d8f61fbb152bca029b56b117c679b03b6a72b467 (diff) | |
| parent | 30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (diff) | |
| download | vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.gz vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.bz2 vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/render/picture.c')
| -rw-r--r-- | xorg-server/render/picture.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c index b2418ef36..d31b77466 100644 --- a/xorg-server/render/picture.c +++ b/xorg-server/render/picture.c @@ -735,13 +735,12 @@ SetPictureToDefaults (PicturePtr pPicture) pPicture->transform = 0;
- pPicture->dither = None;
pPicture->filter = PictureGetFilterId (FilterNearest, -1, TRUE);
pPicture->filter_params = 0;
pPicture->filter_nparams = 0;
pPicture->serialNumber = GC_CHANGE_SERIAL_BIT;
- pPicture->stateChanges = (1 << (CPLastBit+1)) - 1;
+ pPicture->stateChanges = -1;
pPicture->pSourcePict = 0;
}
@@ -1261,7 +1260,7 @@ ChangePicture (PicturePtr pPicture, }
break;
case CPDither:
- pPicture->dither = NEXT_VAL(Atom);
+ (void) NEXT_VAL(Atom); /* unimplemented */
break;
case CPComponentAlpha:
{
@@ -1480,7 +1479,6 @@ CopyPicture (PicturePtr pSrc, pDst->polyMode = pSrc->polyMode;
break;
case CPDither:
- pDst->dither = pSrc->dither;
break;
case CPComponentAlpha:
pDst->componentAlpha = pSrc->componentAlpha;
|