Merge branch 'translation' into 'master'

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

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index e4a07a9fd5ca8bd719c83f4bd084dc442998650e..b148a5bc08cf52b98849d2c71663859a254813cc 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -22,7 +22,7 @@
 #define PANGO_ENABLE_BACKEND
 
 #include <pango/pangoft2.h>
-#include <freetype/ftxf86.h>
+#include FT_XFREE86_H
 
 #include <map>
 #include <cstdio>
@@ -81,8 +81,8 @@ Pango_font::~Pango_font ()
 }
 
 void
-Pango_font::register_font_file (string filename,
-                                string ps_name,
+Pango_font::register_font_file (const string &filename,
+                                const string &ps_name,
                                 int face_index)
 {
   scm_hash_set_x (physical_font_tab_,
@@ -383,7 +383,7 @@ extern bool music_strings_to_paths;
 
 Stencil
 Pango_font::text_stencil (Output_def * /* state */,
-                          string str, bool music_string) const
+                          const string &str, bool music_string) const
 {
   /*
     The text assigned to a PangoLayout is automatically divided