From: kramm <kramm>
Date: Sat, 5 Jul 2003 14:14:41 +0000 (+0000)
Subject: * added freetype support in ttf2pt1
X-Git-Tag: release-0-5-0~214
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=5ede6209244433ea174111a9079fa6d0cf84d227

* added freetype support in ttf2pt1
* ../lib/log.h now handles extern "C" stuff itself.
---

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 193dd44..cef6733 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -46,10 +46,9 @@
 #include "GlobalParams.h"
 //swftools header files
 #include "swfoutput.h"
-extern "C" {
 #include "../lib/log.h"
+
 #include "ttf2pt1.h"
-}
 
 #define logf logarithmf // logf is also used by ../lib/log.h
 #include <math.h>
@@ -1058,7 +1057,13 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 	  char*tmp;
 	  tmp = strdup(mktmpname((char*)name2));
 	  sprintf(name2, "%s", tmp);
-	  char*a[] = {"./ttf2pt1","-pttf","-b", tmpFileName, name2};
+	  char*a[] = {"./ttf2pt1",
+#ifndef USE_FREETYPE
+	      "-pttf",
+#else
+	      "-pft",
+#endif
+	      "-b", tmpFileName, name2};
 	  logf("<verbose> Invoking ttf2pt1...");
 	  ttf2pt1_main(5,a);
 	  unlink(tmpFileName);