Doc-de: updates for Usage

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

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index ac361794e7518a1d570820d69e282e7fc2b99d07..26f2e53fb4b5fce47b0294c5626cd3f9018cb733 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -47,6 +47,10 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap,
                        PangoFontDescription const *description,
                        Real output_scale)
 {
+  // This line looks stupid, but if we don't initialize physical_font_tab_ before
+  // we allocate memory in scm_c_make_hash_table, then that could trigger a garbage
+  // collection.
+  physical_font_tab_ = SCM_EOL;
   physical_font_tab_ = scm_c_make_hash_table (11);
   PangoDirection pango_dir = PANGO_DIRECTION_LTR;
   context_ = pango_context_new ();
@@ -180,8 +184,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 +229,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 +304,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
 {
   /*