SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dcdc_rework

Browse Source 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
This commit is contained in:
Peter Hutterer
2008-04-07 07:56:41 +09:30
parent b46a009186 6c0cfe3d43
commit fd06e8f8c1
182 changed files with 5802 additions and 4881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render/miindex.c
View File

@@ -147,6 +147,7 @@ miBuildRenderColormap (ColormapPtr pColormap, Pixel *pixels, int *nump)
for (g = 0; g < cube; g++)
for (b = 0; b < cube; b++)
{
pixel = 0;
red = (r * 65535 + (cube-1)/2) / (cube - 1);
green = (g * 65535 + (cube-1)/2) / (cube - 1);
blue = (b * 65535 + (cube-1)/2) / (cube - 1);
@@ -157,6 +158,7 @@ miBuildRenderColormap (ColormapPtr pColormap, Pixel *pixels, int *nump)
}
for (g = 0; g < gray; g++)
{
pixel = 0;
red = green = blue = (g * 65535 + (gray-1)/2) / (gray - 1);
if (AllocColor (pColormap, &red, &green, &blue, &pixel, 0) != Success)
return FALSE;