Run grand-replace (issue 3765)

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index bca2bf1c210cd3df20fdfe2c9188ec872a4c2f10..c69333437abbdb729048bf525fcdc25a3f336334 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 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
@@ -32,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;