Fix colormap when grabbing 8 bit depth pixmaps.

SVN revision: 19759
This commit is contained in:
Kim Woelders 2006-01-13 21:27:36 +00:00
parent 9e957fec34
commit 8c6ebda014
1 changed files with 11 additions and 6 deletions

View File

@ -736,14 +736,19 @@ __imlib_GrabDrawableToRGBA(DATA32 * data, int ox, int oy, int ow, int oh,
}
else if (xatt.depth <= 8)
{
if ((!is_pixmap) && (!cm))
if (!cm)
{
cm = xatt.colormap;
if (cm == None)
cm = ratt.colormap;
if (is_pixmap)
{
cm = DefaultColormap(d, DefaultScreen(d));
}
else
{
cm = xatt.colormap;
if (cm == None)
cm = ratt.colormap;
}
}
else
cm = ratt.colormap;
for (i = 0; i < (1 << xatt.depth); i++)
{