mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Kenichi Handa 2009-04-08 01:32:21 +00:00
parent 4ffdb3072c
commit 57d3b93bd5
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

6
src/ftfont.c
View file

@ -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;
}