[Emacs-diffs] emacs/src ftfont.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/04/08 01:30:55

Modified files:
        src            : ftfont.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftfont.c?cvsroot=emacs&r1=1.48&r2=1.49

Patches:
Index: ftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftfont.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- ftfont.c    6 Apr 2009 07:56:47 -0000       1.48
+++ ftfont.c    8 Apr 2009 01:30:55 -0000       1.49
@@ -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;
        }