From 13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 10 May 2012 11:23:10 +0200
Subject: xserver fontconfig mesa git update 10 May 2012

---
 xorg-server/hw/xfree86/modes/xf86RandR12.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/hw/xfree86')

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);
     }
 }
 
-- 
cgit v1.2.3