diff options
| author | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
|---|---|---|
| committer | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
| commit | fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab (patch) | |
| tree | fda1a9d90f4a3e99af9da656939ff8c112cfeb33 /render | |
| parent | b46a00918691cbd5ca80b6d3acae7614f93e073b (diff) | |
| parent | 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459 (diff) | |
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
Diffstat (limited to 'render')
| -rw-r--r-- | render/miindex.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/render/miindex.c b/render/miindex.c index 0e12dca4a..4e0cf0084 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -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; |