X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=4881fa88ebf18d92badfc98242c4ea24c4475c57;hb=d49ac8c9bcdee2b43b4286eda0e1bf8d0fadd3f3;hp=96f125b8354351ba42fd7c3462f54feb72a3b644;hpb=691052d481359cfb2ae48f6336a481f5117281db;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 96f125b..4881fa8 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -44,6 +44,7 @@ static int loglevel = 3;
 static char * pagerange = 0;
 static char * filename = 0;
 static char * password = 0;
+static int zlib = 0;
 
 static char * preloader = 0;
 static char * viewer = 0;
@@ -150,6 +151,7 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "z"))
     {
 	pdfswf_setparameter("enablezlib", "1");
+	zlib = 1;
 	return 0;
     }
     else if (!strcmp(name, "n"))
@@ -176,6 +178,11 @@ int args_callback_option(char*name,char*val) {
 	pdfswf_setparameter("storeallcharacters", "1");
 	return 0;
     }
+    else if (!strcmp(name, "w"))
+    {
+	pdfswf_setparameter("linksopennewwindow", "0");
+	return 0;
+    }
     else if (!strcmp(name, "F"))
     {
 	char *s = strdup(val);
@@ -461,6 +468,7 @@ int main(int argn, char *argv[])
     }
     if(!swf_output_save(swf, outputname))
         exit(1);
+    msg("<notice> SWF written");
     swf_output_destroy(swf);
 
     pdf_destroy(pdf);
@@ -474,15 +482,19 @@ int main(int argn, char *argv[])
 	    printf("\n");
     }
 
+    char*zip = "";
+    if(zlib)
+	zip = "-z";
+
     if(viewer && !preloader) {
-	systemf("swfcombine `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",
+	systemf("swfcombine %s `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",zip,
 		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 %s `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,
 		preloader, SWFDIR, preloader, outputname, outputname);
 	if(!system_quiet)
 	    printf("\n");
@@ -490,7 +502,7 @@ int main(int argn, char *argv[])
     if(preloader && viewer) {
 	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 %s `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",zip,
 		outputname, preloader, SWFDIR, preloader, outputname);
 	systemf("rm __tmp__.swf");
     }