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 @@
+2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals.
+
 2011-06-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * 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,
         if (g->code != FONT_INVALID_CODE)
           {
             FT_Glyph_Metrics *m;
-            int lbearing, rbearing, ascent, descent, xadv;
 
             if (FT_Load_Glyph (ft_face, g->code, FT_LOAD_DEFAULT) != 0)
               abort ();
@@ -1867,7 +1866,6 @@ ftfont_drive_otf (MFLTFont *font,
         {
           MFLTGlyph *g;
           int min_from, max_to;
-          int j;
           int feature_idx = otfg->positioning_type >> 4;
 
           g = out->glyphs + out->used;