diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
| commit | 405ae9defaaa03d4d305b6264a744107c3dd460d (patch) | |
| tree | e119a54d876fa737d859718afbde7ef507702631 /xorg-server/render/picture.c | |
| parent | 3a5976985ab1ca641b095a72730f1f3d3bd5f9bc (diff) | |
| parent | 336bad93d146931c160d8517edfdf0bee49ad9f7 (diff) | |
| download | vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.gz vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.bz2 vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/src/kinput.c
Diffstat (limited to 'xorg-server/render/picture.c')
| -rw-r--r-- | xorg-server/render/picture.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c index ebbfa29e9..2908b7629 100644 --- a/xorg-server/render/picture.c +++ b/xorg-server/render/picture.c @@ -763,7 +763,8 @@ CreatePicture(Picture pid, PicturePtr pPicture; PictureScreenPtr ps = GetPictureScreen(pDrawable->pScreen); - pPicture = dixAllocateObjectWithPrivates(PictureRec, PRIVATE_PICTURE); + pPicture = dixAllocateScreenObjectWithPrivates(pDrawable->pScreen, + PictureRec, PRIVATE_PICTURE); if (!pPicture) { *error = BadAlloc; return 0; @@ -853,7 +854,7 @@ createSourcePicture(void) { PicturePtr pPicture; - pPicture = dixAllocateObjectWithPrivates(PictureRec, PRIVATE_PICTURE); + pPicture = dixAllocateScreenObjectWithPrivates(NULL, PictureRec, PRIVATE_PICTURE); pPicture->pDrawable = 0; pPicture->pFormat = 0; pPicture->pNext = 0; |