Fix for 879

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 0587badadb45b3c594e20a715d2d8b25dcf9f210..480dd8c465d77563a7eb8f7e60e292ffa4740f84 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -180,8 +180,8 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
       glyph_name[0] = '\0';
       if (has_glyph_names)
        {
-         int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name,
-                                            GLYPH_NAME_LEN);
+         FT_Error errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name,
+                                                 GLYPH_NAME_LEN);
          if (errorcode)
            programming_error (
              _f ("FT_Get_Glyph_Name () error: %s",
@@ -225,7 +225,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
 
       *tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_),
                                    scm_from_double (ggeo.x_offset * scale_),
-                                   scm_from_double (ggeo.y_offset * scale_),
+                                   scm_from_double (- ggeo.y_offset * scale_),
                                    char_id),
                        SCM_EOL);
       tail = SCM_CDRLOC (*tail);
@@ -300,7 +300,7 @@ Pango_font::physical_font_tab () const
 extern bool music_strings_to_paths;
 
 Stencil
-Pango_font::text_stencil (Output_def* state,
+Pango_font::text_stencil (Output_def * /* state */,
                          string str, bool music_string) const
 {
   /*