xserver: Branch 'server-1.5-branch'

[Aaron Plattner]

 render/picture.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 77313bdc76b2dc4e9992432379e8d54a99d27d1f
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jun 9 09:52:04 2008 -0700

    CreateColormap returns Success on success, not TRUE.
    
    Fixes a problem where enabling color index overlays disables the RENDER
    extension.
    (cherry picked from commit 607b0d09ea003f87cfb3331e59e13495a483832a)

diff --git a/render/picture.c b/render/picture.c
index 35e2a28..2fbd09e 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -413,8 +413,9 @@ PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format)
 	    (ColormapPtr) LookupIDByType(pScreen->defColormap, RT_COLORMAP);
     } else {
 	VisualPtr pVisual = PictureFindVisual(pScreen, format->index.vid);
-	if (!CreateColormap(FakeClientID (0), pScreen, pVisual,
-		    &format->index.pColormap, AllocNone, 0))
+	if (CreateColormap(FakeClientID (0), pScreen, pVisual,
+		    &format->index.pColormap, AllocNone, 0)
+		!= Success)
 	    return FALSE;
     }
     if (!ps->InitIndexed(pScreen, format))