xserver: Branch 'master' - 3 commits

[Adam Jackson]

 dix/dixfonts.c                 |    1 -
 hw/xfree86/common/xf86Config.c |    1 -
 os/oscolor.c                   |    7 +++----
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit e3ff8501749209ee2dd324d35ae16e37510e0574
Author: Jie Luo <clotho67 at gmail.com>
Date:   Thu Jul 17 10:27:24 2008 -0400

    Remove duplicate load of freetype font renderer.
    
    libXfont will do this for us in FontFileRegisterFpeFunctions.

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 7b79bac..a1ecbfb 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1911,7 +1911,6 @@ InitFonts (void)
 #ifdef BUILTIN_FONTS
     BuiltinRegisterFpeFunctions();
 #else
-    FreeTypeRegisterFontFileFunctions();
     FontFileRegisterFpeFunctions();
     fs_register_fpe_functions();
 #endif
commit 8441e26266701776f1416bec864ae2949355da76
Author: Jie Luo <clotho67 at gmail.com>
Date:   Thu Jul 17 10:23:37 2008 -0400

    Remove freetype from the list of autoloaded modules.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 4b8c9e6..663d81a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -116,7 +116,6 @@ static ModuleDefault ModuleDefaults[] = {
     {.name = "extmod",   .toLoad = TRUE,    .load_opt=NULL},
     {.name = "dbe",      .toLoad = TRUE,    .load_opt=NULL},
     {.name = "glx",      .toLoad = TRUE,    .load_opt=NULL},
-    {.name = "freetype", .toLoad = TRUE,    .load_opt=NULL},
 #ifdef XRECORD
     {.name = "record",   .toLoad = TRUE,    .load_opt=NULL},
 #endif
commit 5d11ae7a69e3a7611c667be4628a15a4b514f72c
Author: Jie Luo <clotho67 at gmail.com>
Date:   Thu Jul 17 10:22:29 2008 -0400

    Fix color lookup.
    
    OsStrCaseCmp returned inverted comparison sense from normal strcasecmp.

diff --git a/os/oscolor.c b/os/oscolor.c
index 10dc2ba..cc45aaf 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -59,7 +59,7 @@ typedef struct _builtinColor {
     unsigned short	name;
 } BuiltinColor;
 
-static const unsigned char BuiltinColorNames[] = {
+static const char BuiltinColorNames[] = {
     "alice blue\0"
     "AliceBlue\0"
     "antique white\0"
@@ -1573,14 +1573,13 @@ static const BuiltinColor BuiltinColors[] = {
 
 Bool
 OsLookupColor(int		screen,
-	      char		*s_name,
+	      char		*name,
 	      unsigned int	len,
 	      unsigned short	*pred,
 	      unsigned short	*pgreen,
 	      unsigned short	*pblue)
 {
     const BuiltinColor	*c;
-    unsigned char	*name = (unsigned char *) s_name;
     int			low, mid, high;
     int			r;
 
@@ -1598,7 +1597,7 @@ OsLookupColor(int		screen,
 	    *pblue = c->blue * 0x101;
 	    return TRUE;
 	}
-	if (r < 0)
+	if (r > 0)
 	    high = mid - 1;
 	else
 	    low = mid + 1;