diff options
| author | Paul Eggert | 2011-06-10 12:31:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-10 12:31:15 -0700 |
| commit | 3f754b86f836bf4cae6d746debfe0954441050a6 (patch) | |
| tree | 63f0c4d9c4ed953540ca191f13554c9dbfd0750e /src | |
| parent | 529a133c390049085db38e7c8f745d650a2626ee (diff) | |
| download | emacs-3f754b86f836bf4cae6d746debfe0954441050a6.tar.gz emacs-3f754b86f836bf4cae6d746debfe0954441050a6.zip | |
* ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/ftfont.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cbb0999d50e..a3cc92d5152 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-06-10 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals. | ||
| 4 | |||
| 1 | 2011-06-10 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-06-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * image.c (gif_load): Fix omitted cast error introduced by | 7 | * image.c (gif_load): Fix omitted cast error introduced by |
diff --git a/src/ftfont.c b/src/ftfont.c index cd8829a3e51..5037d54bc2f 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -1612,7 +1612,6 @@ ftfont_get_metrics (MFLTFont *font, MFLTGlyphString *gstring, | |||
| 1612 | if (g->code != FONT_INVALID_CODE) | 1612 | if (g->code != FONT_INVALID_CODE) |
| 1613 | { | 1613 | { |
| 1614 | FT_Glyph_Metrics *m; | 1614 | FT_Glyph_Metrics *m; |
| 1615 | int lbearing, rbearing, ascent, descent, xadv; | ||
| 1616 | 1615 | ||
| 1617 | if (FT_Load_Glyph (ft_face, g->code, FT_LOAD_DEFAULT) != 0) | 1616 | if (FT_Load_Glyph (ft_face, g->code, FT_LOAD_DEFAULT) != 0) |
| 1618 | abort (); | 1617 | abort (); |
| @@ -1867,7 +1866,6 @@ ftfont_drive_otf (MFLTFont *font, | |||
| 1867 | { | 1866 | { |
| 1868 | MFLTGlyph *g; | 1867 | MFLTGlyph *g; |
| 1869 | int min_from, max_to; | 1868 | int min_from, max_to; |
| 1870 | int j; | ||
| 1871 | int feature_idx = otfg->positioning_type >> 4; | 1869 | int feature_idx = otfg->positioning_type >> 4; |
| 1872 | 1870 | ||
| 1873 | g = out->glyphs + out->used; | 1871 | g = out->glyphs + out->used; |