X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fpdf2swf.c;h=45260197f3971c3efb1564c836b865e232db4dc7;hp=2f5b7b5f9f2ff3e82304c8b444a672f537313934;hb=9f826653fb88e865129c686ccf09d2c700494068;hpb=408548d87d56d17a707415fa2374fd688655c777

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 2f5b7b5..4526019 100644
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -28,9 +28,6 @@
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #include "../lib/args.h"
 #include "../lib/os.h"
 #include "../lib/rfxswf.h"
@@ -417,6 +414,7 @@ void args_callback_usage(char*name)
 	   "                           graphic errors)\n");
     printf("-s filloverlap             Make intersecting shapes overlap, instead of canceling each\n"
 	   "                           other out. (Needed for some Powerpoint PDFs)\n");
+    printf("-s transparent             Make the SWF transparent\n");
     //deliberately undocumented (for now)
     //printf("-2                         Put 2 pages into each frame.\n");
     //printf("-4                         Put 4 pages into each frame.\n");
@@ -486,24 +484,12 @@ int main(int argn, char *argv[])
     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)
     if(installPath) {
-	fontdir = concatPaths(installPath, "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);
+	fontpaths[fontpathpos++] = concatPaths(installPath, "fonts");
     }
-#else
-    fontdir = concatPaths(installPath, "fonts");
-#endif
 
 #ifdef HAVE_SRAND48
     srand48(time(0));
@@ -553,9 +539,6 @@ int main(int argn, char *argv[])
     }
 
     /* add fonts */
-    if(fontdir) {
-	driver->set_parameter("fontdir", fontdir);
-    }
     for(t=0;t<fontpathpos;t++) {
 	driver->set_parameter("fontdir", fontpaths[t]);
     }
@@ -687,9 +670,11 @@ int main(int argn, char *argv[])
 
     pdf->destroy(pdf);
 
-    char*zip = "";
-    if(zlib)
+    const char*zip = "";
+    if(zlib) {
 	zip = "-z";
+    }
+    if(!preloader && viewer) {
 	systemf("swfcombine %s -X %d -Y %d \"%s\" viewport=\"%s\" -o \"%s\"",zip,width,height,
 		viewer, outputname, outputname);
 	if(!system_quiet)