aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-10 11:23:10 +0200
committermarha <marha@users.sourceforge.net>2012-05-10 11:23:10 +0200
commit13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (patch)
tree17a9a3e6a44353fd016b1d0725141bdfc47c4021 /xorg-server/hw
parent8a448108ec0bc3a0a488b2234e0d12aee503c67c (diff)
downloadvcxsrv-13a63d4f69c0692539448cb3d8e4a0e1ffdf2183.tar.gz
vcxsrv-13a63d4f69c0692539448cb3d8e4a0e1ffdf2183.tar.bz2
vcxsrv-13a63d4f69c0692539448cb3d8e4a0e1ffdf2183.zip
xserver fontconfig mesa git update 10 May 2012
Diffstat (limited to 'xorg-server/hw')
-rw-r--r--xorg-server/hw/xfree86/modes/xf86RandR12.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index a773c34c6..aca0734e0 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -1679,11 +1679,11 @@ gamma_to_ramp(float gamma, CARD16 *ramp, int size)
for (i = 0; i < size; i++) {
if (gamma == 1.0)
- ramp[i] = i << 8;
+ ramp[i] = i | i << 8;
else
ramp[i] =
(CARD16) (pow((double) i / (double) (size - 1), 1. / gamma)
- * (double) (size - 1) * 256);
+ * (double) (size - 1) * 257);
}
}