forked from pool/xorg-x11-server
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
Index: programs/Xserver/miext/cw/cw.c
|
||
|
|
===================================================================
|
||
|
|
RCS file: /home/eich/cvs/xc/programs/Xserver/miext/cw/cw.c,v
|
||
|
|
retrieving revision 1.1.1.5
|
||
|
|
diff -u -r1.1.1.5 cw.c
|
||
|
|
--- programs/Xserver/miext/cw/cw.c 25 Nov 2005 10:05:47 -0000 1.1.1.5
|
||
|
|
+++ programs/Xserver/miext/cw/cw.c 28 Nov 2005 18:24:10 -0000
|
||
|
|
@@ -659,7 +659,7 @@
|
||
|
|
SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap);
|
||
|
|
|
||
|
|
#ifdef RENDER
|
||
|
|
- if (GetPictureScreen (pScreen))
|
||
|
|
+ if (GetPictureScreenIfSet (pScreen))
|
||
|
|
cwInitializeRender(pScreen);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
Index: programs/Xserver/render/picture.c
|
||
|
|
===================================================================
|
||
|
|
RCS file: /home/eich/cvs/xc/programs/Xserver/render/picture.c,v
|
||
|
|
retrieving revision 1.1.1.28
|
||
|
|
diff -u -r1.1.1.28 picture.c
|
||
|
|
--- programs/Xserver/render/picture.c 25 Nov 2005 10:05:52 -0000 1.1.1.28
|
||
|
|
+++ programs/Xserver/render/picture.c 28 Nov 2005 18:24:10 -0000
|
||
|
|
@@ -69,9 +69,11 @@
|
||
|
|
Bool
|
||
|
|
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount)
|
||
|
|
{
|
||
|
|
- PictureScreenPtr ps = GetPictureScreen(pScreen);
|
||
|
|
+ PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||
|
|
unsigned int oldamount;
|
||
|
|
|
||
|
|
+ if (!ps) return TRUE;
|
||
|
|
+
|
||
|
|
/* Round up sizes for proper alignment */
|
||
|
|
amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
|
||
|
|
|