# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1239154255 0
# Node ID 3f976a2deab1d078c12dab12b422f5682a2d2891
# Parent  e38631d95db39eb0e6a9fcbc808d0635045c67a1
(ftfont_text_extents): Fix calculation of metrics->descent.

diff -r e38631d95db3 -r 3f976a2deab1 src/ftfont.c
--- a/src/ftfont.c	Tue Apr 07 04:06:39 2009 +0000
+++ b/src/ftfont.c	Wed Apr 08 01:30:55 2009 +0000
@@ -1255,7 +1255,7 @@
 		  metrics->lbearing = m->horiBearingX >> 6;
 		  metrics->rbearing = (m->horiBearingX + m->width) >> 6;
 		  metrics->ascent = m->horiBearingY >> 6;
-		  metrics->descent = (m->horiBearingY + m->height) >> 6;
+		  metrics->descent = (m->height - m->horiBearingY) >> 6;
 		}
 	      first = 0;
 	    }
@@ -1269,8 +1269,8 @@
 		  = width + ((m->horiBearingX + m->width) >> 6);
 	      if (metrics->ascent < (m->horiBearingY >> 6))
 		metrics->ascent = m->horiBearingY >> 6;
-	      if (metrics->descent > ((m->horiBearingY + m->height) >> 6))
-		metrics->descent = (m->horiBearingY + m->height) >> 6;
+	      if (metrics->descent > ((m->height - m->horiBearingY) >> 6))
+		metrics->descent = (m->height - m->horiBearingY) >> 6;
 	    }
 	  width += m->horiAdvance >> 6;
 	}