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

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 30d4e32dcb..3d66f3e8a9 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -1,89 +1,72 @@
-/* 
-  pfb.cc --  implement pfb conversion.
-  
+/*
+  pfb.cc -- implement pfb conversion.
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+using namespace std;
 
+#include "program-option.hh"
 #include "source-file.hh"
+#include "memory-stream.hh"
+#include "open-type-font.hh"
+#include "main.hh"
+#include "warn.hh"
 
 char *
-pfb2pfa (Byte const * pfb, int length)
+pfb2pfa (Byte const *pfb, int length)
 {
-  char * out = new char[1];
+  char *out = (char*) malloc(sizeof(char));
   int olen = 0;
-  
-  Byte const * p = pfb;
-  while (p  < pfb + length)  
+
+  Byte const *p = pfb;
+  while (p < pfb + length)
     {
       if (*p++ != 128)
 	break;
 
       Byte type = *p++;
       if (type == 3)
-	break ;
+	break;
 
-      unsigned seglen =
-	p[0] | (p[1] << 8)
+      unsigned seglen
+	= p[0] | (p[1] << 8)
 	| (p[2] << 16) | (p[3] << 24);
 
       p += 4;
       if (type == 1)
 	{
-	  out = (char*)realloc (out, olen + seglen + 1);
-	  char* outp = out + olen ;
+	  out = (char *)realloc (out, olen + seglen + 1);
+	  char *outp = out + olen;
 	  memcpy (outp, p, seglen);
-	  olen += seglen; 
+	  olen += seglen;
 	  p += seglen;
 	}
       else if (type == 2)
 	{
-	  unsigned outlength =  (seglen * 2) + (seglen / 32) + 2;
+	  unsigned outlength = (seglen * 2) + (seglen / 32) + 2;
 
-	  out = (char*)realloc (out, olen + outlength + 1);
+	  out = (char *)realloc (out, olen + outlength + 1);
 
-	  char * outp = out + olen;
+	  char *outp = out + olen;
 	  for (int i = seglen; i--;)
 	    {
 	      sprintf (outp, "%02x", *p++);
 	      outp += 2;
-	      if (!(i % 32))
-		{
-		  *outp ++ = '\n';
-		}
+	      if (! (i % 32))
+		*outp++ = '\n';
 	    }
 
 	  olen = outp - out;
 	}
-      
     }
   out[olen] = 0;
 
   return out;
 }
 
-LY_DEFINE(ly_pfb_to_pfa, "ly:pfb->pfa",
-	  1,0,0, (SCM pfb_path),
-	  "Convert the contents of a PFB file to PFA."
-	  )
-{
-  SCM_ASSERT_TYPE(scm_is_string (pfb_path), pfb_path,
-		  SCM_ARG1, __FUNCTION__, "string");
-
-  String path = ly_scm2string (pfb_path);
-  int len ; 
-  char *str = gulp_file (path, &len);
-  char *pfa = pfb2pfa ((Byte*)str, len);
-  
-  SCM pfa_scm = scm_makfrom0str(pfa);
-  free (pfa);
-  delete str;
-  return pfa_scm;
-}
-