Merge with master

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 56fc6beebaabfa486cccdcfab81ef88dc8d83c52..f062c986dbcb75a30c7f5947634ede72ba54452c 100644 (file)
--- 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+using namespace std;
 
 #include "program-option.hh"
 #include "source-file.hh"
@@ -58,14 +59,11 @@ pfb2pfa (Byte const *pfb, int length)
              sprintf (outp, "%02x", *p++);
              outp += 2;
              if (! (i % 32))
-               {
-                 *outp++ = '\n';
-               }
+               *outp++ = '\n';
            }
 
          olen = outp - out;
        }
-
     }
   out[olen] = 0;
 
@@ -79,26 +77,23 @@ 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);
-
-  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 ("]");
-  
+
   return pfa_scm;
 }
 
-
-
 LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
           1, 0, 0, (SCM otf_file_name),
           "Convert the contents of a OTF file to CFF file, returning it as "
@@ -107,19 +102,19 @@ 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)
     progress_indication ("]");
-  
+
   return asscm;
-}         
- 
+}
+