X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=a5e7cf81f911a5761562aa294ebbca5e243528e0;hb=335b6b2b798d308f333c371caae0bfc7628506db;hp=affbdb940a2078612839beb1414a65c726cd82a7;hpb=9aa850fb4c4b28c64d53e144b4a107d982917b2e;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index affbdb9..a5e7cf8 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -36,7 +36,6 @@
 extern "C" {
 #include "log.h"
 }
-#include "xpdf/gfile.h"
 
 #ifndef WIN32
 #define FONTDIR SWFTOOLS_DATADIR "/fonts"
@@ -318,18 +317,21 @@ void args_callback_usage(char*name)
 #endif
     printf("-V  --version              Print program version\n");
     printf("\nEnhanced conversion options:\n");
-    printf("-t  --stop                 Insert a \"Stop\" Tag in every frame (don't turn pages automatically)\n");
     printf("-S  --shapes               Don't use SWF Fonts, but store everything as shape\n");
     printf("-z  --zlib                 Use Flash 6 (MX) zlib compression (Needs at least Flash 6 Plugin to play)\n");
-    printf("-j  --jpegquality=quality  Set quality of embedded jpeg pictures (default:85)\n");
     printf("-w  --samewindow           Don't open a new Browser Window for Links in the SWF\n");
     printf("-f  --fonts                Store full fonts in SWF. (Don't reduce to used characters)\n");
     printf("-T  --flashversion=num     Set the flash version in the header to num (default: 4)\n");
+    printf("-s insertstop              Insert a \"Stop\" Tag in every frame (don't turn pages automatically)\n");
+    printf("-s zoom=factor             Scale result, default: 72\n");
+    printf("-s jpegquality=quality     Set quality of embedded jpeg pictures (default:85)\n");
     printf("-s caplinewidth=value      Set the minimum line width to trigger cap style handling to value. (3)\n");
     printf("-s splinequality=value     Set the quality of spline convertion to value (0-100, default: 100).\n");
     printf("-s fontquality=value       Set the quality of font convertion to value (0-100, default: 100).\n");
-    printf("-s ignoredraworder         Ignore draw order (makes the SWF file smaller, but may produce\n"
+    printf("-s ignoredraworder         Ignore draw order (makes the SWF file smaller and faster, but may produce\n"
 	   "                           graphic errors)\n");
+    printf("-s filloverlap             Make intersecting shapes overlap, instead of canceling each\n"
+	   "                           other out. (Needed for some Powerpoint PDFs)\n");
     printf("Postprocessing options:\n");
 #ifndef SYSTEM_BACKTICKS
     printf("(They might not work because your system call doesn't support command substitution)\n");
@@ -503,22 +505,22 @@ int main(int argn, char *argv[])
     }
 
     if(viewer && !preloader) {
-	systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s",
+	systemf("swfcombine `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",
 		outputname, viewer, outputname, outputname);
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && !viewer) {
 	msg("<warning> --preloader option without --viewer option doesn't make very much sense.");
-	ret = systemf("swfcombine `swfdump -r %s` %s/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
+	ret = systemf("swfcombine `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",
 		preloader, SWFDIR, preloader, outputname, outputname);
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && viewer) {
-	systemf("swfcombine %s viewport=%s -o __tmp__.swf",
+	systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf",
 		viewer, outputname, outputname);
-	systemf("swfcombine `swfdump -XY %s` `swfdump -r %s` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o %s",
+	systemf("swfcombine `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",
 		outputname, preloader, SWFDIR, preloader, outputname);
 	systemf("rm __tmp__.swf");
     }