From 29e81f7159dfbc7dbe42d854ed2a49b1dd4a08c7 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Sun, 16 Apr 2006 13:38:32 +0000
Subject: [PATCH] only set an implicit fontdir if we have an installation
 path.

---
 pdf2swf/pdf2swf.cc |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 5510226..3706afc 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -39,7 +39,6 @@
 #include "SWFOutputDev.h"
 #include "log.h"
 
-#define FONTDIR concatPaths(getInstallationPath(), "fonts")
 #define SWFDIR concatPaths(getInstallationPath(), "swfs")
 
 static char * outputname = 0;
@@ -439,17 +438,22 @@ int main(int argn, char *argv[])
     char t1searchpath[1024];
     int nup_pos = 0;
     int x,y;
+    char* installPath = getInstallationPath();
+    char* fontdir = 0;
     
     initLog(0,-1,0,0,-1,loglevel);
 
 #if defined(WIN32) && defined(HAVE_STAT) && defined(HAVE_SYS_STAT_H)
-    FILE*test = fopen(concatPaths(FONTDIR,"\\d050000l.afm"), "rb");
-    if(!test) {
-	fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(FONTDIR, "\\d050000l.afm"));
-	perror("open");
-	exit(1);
+    if(installPath) {
+	fontdir = concatPaths(getInstallationPath(), "fonts");
+	FILE*test = fopen(concatPaths(fontdir,"\\d050000l.afm"), "rb");
+	if(!test) {
+	    fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(fontdir, "\\d050000l.afm"));
+	    perror("open");
+	    exit(1);
+	}
+	fclose(test);
     }
-    fclose(test);
 #endif
 
 #ifdef HAVE_SRAND48
@@ -490,7 +494,9 @@ int main(int argn, char *argv[])
     }
 
     /* add fonts */
-    pdfswf_addfontdir(FONTDIR);
+    if(fontdir) {
+	pdfswf_addfontdir(fontdir);
+    }
     for(t=0;t<fontpathpos;t++) {
 	pdfswf_addfontdir(fontpaths[t]);
     }
-- 
1.7.10.4