X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=101f4f0fc68a7c947470b226b0fcb903b6395046;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=ba31e175138abc8b5051d7d339fc4e5f7c229b2f;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index ba31e17513..101f4f0fc6 100644
--- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 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
@@ -20,8 +20,11 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
 using namespace std;
 
+#include "international.hh"
 #include "program-option.hh"
 #include "source-file.hh"
 #include "memory-stream.hh"
@@ -29,55 +32,61 @@ using namespace std;
 #include "main.hh"
 #include "warn.hh"
 
-char *
-pfb2pfa (Byte const *pfb, int length)
+vector<char>
+pfb2pfa (const vector<char> &pfb)
 {
-  char *out = (char*) malloc(sizeof(char));
-  int olen = 0;
+  vector<char> out;
 
-  Byte const *p = pfb;
-  while (p < pfb + length)
+  vector<char>::const_iterator p = pfb.begin ();
+  while (p < pfb.end ())
     {
-      if (*p++ != 128)
-	break;
+      if (static_cast<Byte>(*p++) != 128)
+        {
+          error (_ ("Segment header of the Type 1 (PFB) font is broken."));
+          break;
+        }
 
-      Byte type = *p++;
+      Byte type = static_cast<Byte>(*p++);
       if (type == 3)
-	break;
+        break;
+
+      size_t seglen = static_cast<Byte>(*p++);
+      seglen |= (static_cast<Byte>(*p++) << 8);
+      seglen |= (static_cast<Byte>(*p++) << 16);
+      seglen |= (static_cast<Byte>(*p++) << 24);
+      if ((p + seglen) > pfb.end ())
+        {
+          error (_ ("Segment length of the Type 1 (PFB) font is too long."));
+          break;
+        }
 
-      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;
-	  memcpy (outp, p, seglen);
-	  olen += seglen;
-	  p += seglen;
-	}
+        {
+          copy (p, p + seglen, back_inserter (out));
+          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;
-	}
+        {
+          stringstream ss;
+
+          ss << hex << setfill ('0');
+
+          for (size_t i = seglen; i > 0; --i)
+            {
+              ss << setw (2) << static_cast<int>(static_cast<Byte>(*p++));
+              if (! (i % 32))
+                ss << '\n';
+            }
+
+          string str = ss.str ();
+          copy (str.begin (), str.end (), back_inserter (out));
+        }
+      else
+        {
+          error (_ ("Segment type of the Type 1 (PFB) font is unknown."));
+          break;
+        }
     }
-  out[olen] = 0;
 
   return out;
 }
-