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

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 49e0942..3b5c8b4 100644
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -187,31 +187,39 @@ int args_callback_option(char*name,char*val) {
 	if(c && *c && c[1])  {
 	    *c = 0;
 	    c++;
-	    driver->set_parameter(s,c);
+	    driver->set_parameter(driver, s,c);
 	}
 	else
-	    driver->set_parameter(s,"1");
+	    driver->set_parameter(driver, s,"1");
 	return 1;
     }
     else if (!strcmp(name, "S"))
     {
-	driver->set_parameter("drawonlyshapes", "1");
+	driver->set_parameter(driver, "drawonlyshapes", "1");
 	return 0;
     }
     else if (!strcmp(name, "i"))
     {
-	driver->set_parameter("ignoredraworder", "1");
+	driver->set_parameter(driver, "ignoredraworder", "1");
 	return 0;
     }
+#ifndef WIN32
+    else if (!strcmp(name, "Q"))
+    {
+	int seconds = atoi(val);
+	alarm(seconds);
+	return 1;
+    }
+#endif
     else if (!strcmp(name, "z"))
     {
-	driver->set_parameter("enablezlib", "1");
+	driver->set_parameter(driver, "enablezlib", "1");
 	zlib = 1;
 	return 0;
     }
     else if (!strcmp(name, "n"))
     {
-	driver->set_parameter("opennewwindow", "1");
+	driver->set_parameter(driver, "opennewwindow", "1");
 	return 0;
     }
     else if (!strcmp(name, "I"))
@@ -221,29 +229,47 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "t"))
     {
-	driver->set_parameter("insertstop", "1");
+	driver->set_parameter(driver, "insertstop", "1");
 	return 0;
     }
     else if (!strcmp(name, "T"))
     {
 	if(!strcasecmp(val, "mx"))
-	    driver->set_parameter("flashversion", "6");
+	    driver->set_parameter(driver, "flashversion", "6");
 	else
-	    driver->set_parameter("flashversion", val);
+	    driver->set_parameter(driver, "flashversion", val);
 
 	return 1;
     }
     else if (!strcmp(name, "f"))
     {
-	driver->set_parameter("storeallcharacters", "1");
-	driver->set_parameter("extrafontdata", "1");
+	driver->set_parameter(driver, "storeallcharacters", "1");
+	driver->set_parameter(driver, "extrafontdata", "1");
 	return 0;
     }
     else if (!strcmp(name, "w"))
     {
-	driver->set_parameter("linksopennewwindow", "0");
+	driver->set_parameter(driver, "linksopennewwindow", "0");
 	return 0;
     }
+    else if (!strcmp(name, "O"))
+    {
+	int level = 1;
+	int ret=0;
+	if(val&& val[0] && val[1]==0 && isdigit(val[0])) {
+	    level = atoi(val);
+	    ret=1;
+	}
+	if(level>=1)
+	    driver->set_parameter(driver, "poly2bitmap", "1");
+	if(level>=2)
+	    driver->set_parameter(driver, "bitmapfonts", "1");
+	if(level>=3)
+	    driver->set_parameter(driver, "ignoredraworder", "1");
+
+	flatten = 1;
+	return ret;
+    }
     else if (!strcmp(name, "G"))
     {
 	flatten = 1;
@@ -307,10 +333,10 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "j"))
     {
 	if(name[1]) {
-	    driver->set_parameter("jpegquality", &name[1]);
+	    driver->set_parameter(driver, "jpegquality", &name[1]);
 	    return 0;
 	} else {
-	    driver->set_parameter("jpegquality", val);
+	    driver->set_parameter(driver, "jpegquality", val);
 	    return 1;
 	}
     }
@@ -353,6 +379,7 @@ struct options_t options[] =
  {"z","zlib"},
  {"s","set"},
  {"S","shapes"},
+ {"Q","maxtime"},
  {"j","jpegquality"},
  {"p","pages"},
  {"w","samewindow"},
@@ -449,7 +476,7 @@ float getRate(char*filename)
 
 void show_info(gfxsource_t*driver, char*filename)
 {
-    gfxdocument_t* pdf = driver->open(filename);
+    gfxdocument_t* pdf = driver->open(driver, filename);
     int pagenr;
     FILE*fo=0;
     if(!pdf) {
@@ -533,7 +560,7 @@ int main(int argn, char *argv[])
     is_in_range(0x7fffffff, pagerange);
 
     if(pagerange)
-	driver->set_parameter("pages", pagerange);
+	driver->set_parameter(driver, "pages", pagerange);
 
     if (!filename) {
 	args_callback_usage(argv[0]);
@@ -542,7 +569,7 @@ int main(int argn, char *argv[])
 
     /* add fonts */
     for(t=0;t<fontpathpos;t++) {
-	driver->set_parameter("fontdir", fontpaths[t]);
+	driver->set_parameter(driver, "fontdir", fontpaths[t]);
     }
 
     char fullname[256];
@@ -551,7 +578,7 @@ int main(int argn, char *argv[])
 	filename = fullname;
     }
 
-    gfxdocument_t* pdf = driver->open(filename);
+    gfxdocument_t* pdf = driver->open(driver, filename);
     if(!pdf) {
         msg("<error> Couldn't open %s", filename);
         exit(1);
@@ -671,6 +698,7 @@ int main(int argn, char *argv[])
     result->destroy(result);
 
     pdf->destroy(pdf);
+    driver->destroy(driver);
 
     const char*zip = "";
     if(zlib) {
@@ -690,13 +718,20 @@ int main(int argn, char *argv[])
 	    printf("\n");
     }
     if(preloader && viewer) {
-	systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf",
-		viewer, outputname);
-	systemf("swfcombine %s -X %d -Y %d -r %f %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",zip,width,height,
-		getRate(preloader), SWFDIR, preloader, outputname);
-	systemf("rm __tmp__.swf");
+#ifdef HAVE_MKSTEMP
+        char tmpname[] = "__swf__XXXXXX";
+        mkstemp(tmpname);
+#else 
+	char*tmpname = "__tmp__.swf";
+#endif
+	systemf("swfcombine \"%s\" viewport=%s -o %s",
+		viewer, outputname, tmpname);
+        systemf("swfcombine %s -X %d -Y %d -r %f %s/PreLoaderTemplate.swf loader=%s movie=%s -o \"%s\"",zip,width,height,
+                getRate(preloader), SWFDIR, preloader, tmpname, outputname);
+        systemf("rm %s", tmpname);
     }
 
+
     return 0;
 }