X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=678e480b90f6a693e318bcdb3bf1d76ffd948e00;hb=7dcae7597fae14ce5c4e2e7d50c2709d162b7332;hp=56fc6beebaabfa486cccdcfab81ef88dc8d83c52;hpb=a2b44b35df1110681fcb096ae1df74c2a47150f1;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 56fc6beeba..678e480b90 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"
@@ -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,12 +77,12 @@ 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);
+  int len = -1;
 
   if (be_verbose_global)
     progress_indication ("[" + file_name);
-
+  
   char *str = gulp_file (file_name, &len);
   char *pfa = pfb2pfa ((Byte *)str, len);
 
@@ -93,12 +91,10 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->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 +103,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;
-}	   
- 
+}
+