X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=3d66f3e8a9b96431d1c13b0e413cc14efbfe52da;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=b27fe906c55727ca62b5714dc5baff8df4436b33;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index b27fe906c5..3d66f3e8a9 100644
--- 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--2009 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,52 +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");
-
-  std::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);
-
-  SCM pfa_scm = scm_makfrom0str (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 "
-	   " a string.")
-{
-  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);
-  if (be_verbose_global)
-    progress_indication ("[" + file_name);
-
-  FT_Face face = open_ft_face (file_name);
-  std::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;
-}
-