Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 678e480b90f6a693e318bcdb3bf1d76ffd948e00..f062c986dbcb75a30c7f5947634ede72ba54452c 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
@@ -78,17 +78,16 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa",
                   SCM_ARG1, __FUNCTION__, "string");
 
   string file_name = ly_scm2string (pfb_file_name);
-  int len = -1;
 
   if (be_verbose_global)
     progress_indication ("[" + file_name);
   
-  char *str = gulp_file (file_name, &len);
-  char *pfa = pfb2pfa ((Byte *)str, len);
-
-  SCM pfa_scm = scm_makfrom0str (pfa);
+  vector<char> pfb_string = gulp_file (file_name, 0);
+  char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
+  
+  SCM pfa_scm = scm_from_locale_string (pfa);
   free (pfa);
-  delete str;
+
   if (be_verbose_global)
     progress_indication ("]");