[Xorg-commit] xc/lib/font/FreeType ftfuncs.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

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

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

Index: ftfuncs.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/ftfuncs.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- ftfuncs.c	26 Nov 2003 22:48:40 -0000	1.1.4.1
+++ ftfuncs.c	6 Dec 2003 13:24:22 -0000	1.1.4.2
@@ -26,7 +26,8 @@
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.37 2003/11/20 22:36:35 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.38 2003/11/29 01:37:36 dawes Exp $ */
+/* $XdotOrg$ */
 
 #include "fontmisc.h"
 
@@ -3043,7 +3044,7 @@
 		    int ai_lsb,ai_rsb,ai_total;
 		    if( 0 < ins_ttcap->autoItalic ) ai=ins_ttcap->autoItalic;
 		    else ai = -ins_ttcap->autoItalic;
-		    ai_total = (int)( b_width_diagonal * ai + 0.5);
+		    ai_total = (int)( (ascent+descent) * ai + 0.5);
 		    ai_rsb = (int)((double)ai_total * ascent / ( ascent + descent ) + 0.5 );
 		    ai_lsb = -(ai_total - ai_rsb);
 		    if( 0 < ins_ttcap->autoItalic ) {
@@ -3121,7 +3122,7 @@
 		int ai_lsb,ai_rsb,ai_total;
 		if( 0 < ins_ttcap->autoItalic ) ai=ins_ttcap->autoItalic;
 		else ai = -ins_ttcap->autoItalic;
-		ai_total = (int)( ai * smetrics->max_advance / 64.0 + 0.5);
+		ai_total = (int)( (ascent+descent) * ai + 0.5);
 		ai_rsb = (int)((double)ai_total * ascent / ( ascent + descent ) + 0.5 );
 		ai_lsb = -(ai_total - ai_rsb);
 		if( 0 < ins_ttcap->autoItalic ) {