X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=a96aac7761deb7518e5c69e6c6132463b5ee5a16;hb=4636871eb1553366d92750f1dc7aeb8012bb81a0;hp=d5961f12f5464e1c3bc728a3aa0aaf901425be05;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index d5961f12f5..a96aac7761 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+using namespace std;
 
 #include "program-option.hh"
 #include "source-file.hh"
@@ -76,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");
 
-  String file_name = ly_scm2string (pfb_file_name);
-  int len;
+  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);
-
+  
+  vector<char> pfb_string = gulp_file (file_name, 0);
+  char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
+  
   SCM pfa_scm = scm_makfrom0str (pfa);
   free (pfa);
-  delete str;
+
   if (be_verbose_global)
     progress_indication ("]");
 
@@ -102,14 +102,14 @@ 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");
 
-  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);
-  String table = get_otf_table (face, "CFF ");
+  string table = get_otf_table (face, "CFF ");
 
-  SCM asscm = scm_from_locale_stringn ((char *) table.get_bytes (),
+  SCM asscm = scm_from_locale_stringn ((char *) table.data (),
 				       table.length ());
 
   if (be_verbose_global)