Run `make grand-replace'.

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index f062c986dbcb75a30c7f5947634ede72ba54452c..e699156fc914fd109b898c2fdd9a7d53e566caea 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
@@ -21,7 +21,7 @@ using namespace std;
 char *
 pfb2pfa (Byte const *pfb, int length)
 {
-  char *out = new char[1];
+  char *out = (char*) malloc(sizeof(char));
   int olen = 0;
 
   Byte const *p = pfb;
@@ -70,51 +70,3 @@ pfb2pfa (Byte const *pfb, int length)
   return out;
 }
 
-LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa",
-          1, 0, 0, (SCM pfb_file_name),
-          "Convert the contents of a PFB file to 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);
-
-  if (be_verbose_global)
-    progress_indication ("[" + file_name);
-  
-  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);
-
-  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 "
-          " a string.")
-{
-  SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_file_name,
-                  SCM_ARG1, __FUNCTION__, "string");
-
-  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 ");
-
-  SCM asscm = scm_from_locale_stringn ((char *) table.data (),
-                                      table.length ());
-
-  if (be_verbose_global)
-    progress_indication ("]");
-
-  return asscm;
-}
-