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 b27fe906c55727ca62b5714dc5baff8df4436b33..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>
@@ -77,18 +77,17 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa",
   SCM_ASSERT_TYPE (scm_is_string (pfb_file_name), pfb_file_name,
                   SCM_ARG1, __FUNCTION__, "string");
 
-  std::string file_name = ly_scm2string (pfb_file_name);
-  int len = -1;
+  string file_name = ly_scm2string (pfb_file_name);
 
   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 ("]");
 
@@ -103,12 +102,12 @@ LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
   SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_file_name,
                   SCM_ARG1, __FUNCTION__, "string");
 
-  std::string file_name = ly_scm2string (otf_file_name);
+  string file_name = ly_scm2string (otf_file_name);
   if (be_verbose_global)
     progress_indication ("[" + file_name);
 
   FT_Face face = open_ft_face (file_name);
-  std::string table = get_otf_table (face, "CFF ");
+  string table = get_otf_table (face, "CFF ");
 
   SCM asscm = scm_from_locale_stringn ((char *) table.data (),
                                       table.length ());