(ftfont_text_extents): Fix calculation of metrics->descent.

diff --git a/src/ChangeLog b/src/ChangeLog
index a76c86f11951aafee6f6af92e39a4bb6f9598b4a..3ae638fbb4167674ee3eddaf7a280b6af4f58e93 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * ftfont.c (ftfont_text_extents): Fix calculation of
+       metrics->descent.
+
 2009-04-06  Jason Rumney  <jasonr@gnu.org>
 
        * frame.c (x_set_font): Avoid C99 mid-block variable declaration.

diff --git a/src/ftfont.c b/src/ftfont.c
index f515856bcba26ddfb49dcc73c9eda099af249aad..0be985e30f20648aa3c8e26dbda99444e3c196b5 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1255,7 +1255,7 @@ ftfont_text_extents (font, code, nglyphs, metrics)
                  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 @@ ftfont_text_extents (font, code, nglyphs, metrics)
                  = 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;
        }