View | Details | Raw Unified | Return to bug 133989
Collapse All | Expand All

(-)programs/Xserver/miext/cw/cw.c (-1 / +1 lines)
Lines 659-665 Link Here
659
    SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap);
659
    SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap);
660
660
661
#ifdef RENDER
661
#ifdef RENDER
662
    if (GetPictureScreen (pScreen))
662
    if (GetPictureScreenIfSet (pScreen))
663
	cwInitializeRender(pScreen);
663
	cwInitializeRender(pScreen);
664
#endif
664
#endif
665
}
665
}
(-)programs/Xserver/render/picture.c (-1 / +3 lines)
Lines 69-77 Link Here
69
Bool
69
Bool
70
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount)
70
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount)
71
{
71
{
72
    PictureScreenPtr	ps = GetPictureScreen(pScreen);
72
    PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
73
    unsigned int	oldamount;
73
    unsigned int	oldamount;
74
74
75
    if (!ps) return TRUE;
76
    
75
    /* Round up sizes for proper alignment */
77
    /* Round up sizes for proper alignment */
76
    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
78
    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
77
79

Return to bug 133989