X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpdf2swf.c;h=49e0942106cf448a0bd84d0c0260e25926265c5e;hb=52bf9c42eadcfb02311b9b3e46ac70a391057093;hp=4241b559be2258ff0563ede1b5d49c382618e105;hpb=e1b0e6caeec7eba3ba7e5441e80f95fae4c8ca78;p=swftools.git

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 4241b55..49e0942 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"
@@ -239,6 +236,7 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "f"))
     {
 	driver->set_parameter("storeallcharacters", "1");
+	driver->set_parameter("extrafontdata", "1");
 	return 0;
     }
     else if (!strcmp(name, "w"))
@@ -417,6 +415,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 +485,13 @@ 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);
-    }
-#else
-    fontdir = concatPaths(installPath, "fonts");
-#endif
+    /* not needed anymore since fonts are embedded
+       if(installPath) {
+	fontpaths[fontpathpos++] = concatPaths(installPath, "fonts");
+    }*/
 
 #ifdef HAVE_SRAND48
     srand48(time(0));
@@ -553,9 +541,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,7 +672,7 @@ int main(int argn, char *argv[])
 
     pdf->destroy(pdf);
 
-    char*zip = "";
+    const char*zip = "";
     if(zlib) {
 	zip = "-z";
     }