diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-04-08 01:32:21 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-04-08 01:32:21 +0000 |
| commit | 57d3b93bd53e8ae68d43bd16a2ed752fbe3e280f (patch) | |
| tree | 01cf3388bfcd8a87f946b01ed0aa06ea174dcd93 /src/ftfont.c | |
| parent | 4ffdb3072cd0162c548d681b18d9fde3f07d9dbc (diff) | |
| download | emacs-57d3b93bd53e8ae68d43bd16a2ed752fbe3e280f.tar.gz emacs-57d3b93bd53e8ae68d43bd16a2ed752fbe3e280f.tar.bz2 emacs-57d3b93bd53e8ae68d43bd16a2ed752fbe3e280f.zip | |
(ftfont_text_extents): Fix calculation of metrics->descent.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index f515856bcba..0be985e30f2 100644 --- 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; } |