X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=c69333437abbdb729048bf525fcdc25a3f336334;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=438fe78497e8b3ddc6c259803e87197f7b4d0053;hpb=b3e7bc3a6fd47b2fa6d97ceb8ffb42ad20dd9057;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 438fe78497..c69333437a 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -1,9 +1,20 @@
 /*
-  pfb.cc -- implement pfb conversion.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cstdlib>
@@ -21,49 +32,49 @@ using namespace std;
 char *
 pfb2pfa (Byte const *pfb, int length)
 {
-  char *out = (char*) malloc(sizeof(char));
-  int olen = 0;
+  char *out = (char *) malloc (sizeof (char));
+  long olen = 0;
 
   Byte const *p = pfb;
   while (p < pfb + length)
     {
       if (*p++ != 128)
-	break;
+        break;
 
       Byte type = *p++;
       if (type == 3)
-	break;
+        break;
 
       unsigned seglen
-	= p[0] | (p[1] << 8)
-	| (p[2] << 16) | (p[3] << 24);
+        = 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;
-	  memcpy (outp, p, seglen);
-	  olen += seglen;
-	  p += seglen;
-	}
+        {
+          out = (char *)realloc (out, olen + seglen + 1);
+          char *outp = out + olen;
+          memcpy (outp, p, seglen);
+          olen += seglen;
+          p += seglen;
+        }
       else if (type == 2)
-	{
-	  unsigned outlength = (seglen * 2) + (seglen / 32) + 2;
-
-	  out = (char *)realloc (out, olen + outlength + 1);
-
-	  char *outp = out + olen;
-	  for (int i = seglen; i--;)
-	    {
-	      sprintf (outp, "%02x", *p++);
-	      outp += 2;
-	      if (! (i % 32))
-		*outp++ = '\n';
-	    }
-
-	  olen = outp - out;
-	}
+        {
+          unsigned outlength = (seglen * 2) + (seglen / 32) + 2;
+
+          out = (char *)realloc (out, olen + outlength + 1);
+
+          char *outp = out + olen;
+          for (int i = seglen; i--;)
+            {
+              sprintf (outp, "%02x", *p++);
+              outp += 2;
+              if (! (i % 32))
+                *outp++ = '\n';
+            }
+
+          olen = outp - out;
+        }
     }
   out[olen] = 0;