[Xorg-commit] xc/lib/font/fc fserve.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/font/fc
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/font/fc

Modified Files:
      Tag: XORG-CURRENT
	fserve.c 
Log Message:
merge XFree86 4.3.99.901 (RC1) from vendor branch

Index: fserve.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/fc/fserve.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- fserve.c	26 Nov 2003 22:48:40 -0000	1.1.4.2
+++ fserve.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
 /*
 
@@ -24,7 +25,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/fc/fserve.c,v 3.25 2003/11/20 18:16:34 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26 2003/11/22 02:12:37 dawes Exp $ */
 
 /*
  * Copyright 1990 Network Computing Devices
@@ -1052,44 +1053,27 @@
 		ci->metrics.descent = FONT_MAX_DESCENT(fi);
 		ci->metrics.characterWidth = FONT_MAX_WIDTH(fi);
 		ci->metrics.attributes = ii->metrics.attributes;
-		/* Bounds check. */
-		if (ci->metrics.ascent > fi->maxbounds.ascent)
-		{
-		    ErrorF("fserve: warning: %s %s ascent (%d) "
-			   "> maxascent (%d)\n",
-			   fpe->name, fsd->name,
-			   ci->metrics.ascent, fi->maxbounds.ascent);
-		    ci->metrics.ascent = fi->maxbounds.ascent;
-		}
-		if (ci->metrics.descent > fi->maxbounds.descent)
-		{
-		    ErrorF("fserve: warning: %s %s descent (%d) "
-			   "> maxdescent (%d)\n",
-			   fpe->name, fsd->name,
-			   ci->metrics.descent, fi->maxbounds.descent);
-		    ci->metrics.descent = fi->maxbounds.descent;
-		}
 	    }
 	    else
 	    {
 		ci->metrics = ii->metrics;
-		/* Bounds check. */
-		if (ci->metrics.ascent > fi->maxbounds.ascent)
-		{
-		    ErrorF("fserve: warning: %s %s ascent (%d) "
-			   "> maxascent (%d)\n",
-			   fpe->name, fsd->name,
-			   ci->metrics.ascent, fi->maxbounds.ascent);
-		    ci->metrics.ascent = fi->maxbounds.ascent;
-		}
-		if (ci->metrics.descent > fi->maxbounds.descent)
-		{
-		    ErrorF("fserve: warning: %s %s descent (%d) "
-			   "> maxdescent (%d)\n",
-			   fpe->name, fsd->name,
-			   ci->metrics.descent, fi->maxbounds.descent);
-		    ci->metrics.descent = fi->maxbounds.descent;
-		}
+	    }
+	    /* Bounds check. */
+	    if (ci->metrics.ascent > fi->maxbounds.ascent)
+	    {
+		ErrorF("fserve: warning: %s %s ascent (%d) "
+		       "> maxascent (%d)\n",
+		       fpe->name, fsd->name,
+		       ci->metrics.ascent, fi->maxbounds.ascent);
+		ci->metrics.ascent = fi->maxbounds.ascent;
+	    }
+	    if (ci->metrics.descent > fi->maxbounds.descent)
+	    {
+		ErrorF("fserve: warning: %s %s descent (%d) "
+		       "> maxdescent (%d)\n",
+		       fpe->name, fsd->name,
+		       ci->metrics.descent, fi->maxbounds.descent);
+		ci->metrics.descent = fi->maxbounds.descent;
 	    }
 	}
     }