X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpdf2swf.c;h=4f82dfc11039b32d97d7e29f92317c7254801a3c;hb=60c0d1f208a941d251f049bb9c10d5a1a69e076d;hp=5b258d1aca17c2f6f742bcbf8e8cedfb9bba0130;hpb=fe0bf96d27b7af11538533b4df9eca5cbc96eedf;p=swftools.git

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 5b258d1..4f82dfc 100644
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -266,7 +266,7 @@ int args_callback_option(char*name,char*val) {
 	} else if(!strcmp(s,"help")) {
 	    printf("PDF Parameters:\n");
 	    gfxsource_t*pdf = gfxsource_pdf_create();
-	    pdf->set_parameter(pdf, "help", "");
+	    pdf->setparameter(pdf, "help", "");
 	    gfxdevice_t swf;
 	    gfxdevice_swf_init(&swf);
 	    printf("SWF Parameters:\n");
@@ -630,7 +630,7 @@ int main(int argn, char *argv[])
     /* pass global parameters to PDF driver*/
     parameter_t*p = device_config;
     while(p) {
-	driver->set_parameter(driver, p->name, p->value);
+	driver->setparameter(driver, p->name, p->value);
 	p = p->next;
     }
 
@@ -640,18 +640,20 @@ int main(int argn, char *argv[])
 	exit(1);
     }
 
-    if(!outputname)
-    {
-	if(filename) {
-	    outputname = stripFilename(filename, ".swf");
-	    msg("<notice> Output filename not given. Writing to %s", outputname);
-	} 
-    }
-	
-    if(!outputname)
-    {
-	fprintf(stderr, "Please use -o to specify an output file\n");
-	exit(1);
+    if (!info_only) {
+        if(!outputname)
+        {
+            if(filename) {
+                outputname = stripFilename(filename, ".swf");
+                msg("<notice> Output filename not given. Writing to %s", outputname);
+            } 
+        }
+            
+        if(!outputname)
+        {
+            fprintf(stderr, "Please use -o to specify an output file\n");
+            exit(1);
+        }
     }
 
     // test if the page range is o.k.
@@ -669,18 +671,18 @@ int main(int argn, char *argv[])
     }
     
     if(pagerange)
-	driver->set_parameter(driver, "pages", pagerange);
+	driver->setparameter(driver, "pages", pagerange);
+
+    /* add fonts */
+    for(t=0;t<fontpathpos;t++) {
+	driver->setparameter(driver, "fontdir", fontpaths[t]);
+    }
 
     if(info_only) {
 	show_info(driver, filename);
 	return 0;
     }
 
-    /* add fonts */
-    for(t=0;t<fontpathpos;t++) {
-	driver->set_parameter(driver, "fontdir", fontpaths[t]);
-    }
-
     char*u = 0;
     if((u = strchr(outputname, '%'))) {
 	if(strchr(u+1, '%') || 
@@ -711,7 +713,7 @@ int main(int argn, char *argv[])
     /* pass global parameters document */
     p = device_config;
     while(p) {
-	pdf->set_parameter(pdf, p->name, p->value);
+	pdf->setparameter(pdf, p->name, p->value);
 	p = p->next;
     }
 
@@ -730,7 +732,7 @@ int main(int argn, char *argv[])
 	if(is_in_range(pagenr, pagerange)) {
 	    char mapping[80];
 	    sprintf(mapping, "%d:%d", pagenr, frame);
-	    pdf->set_parameter(pdf, "pagemap", mapping);
+	    pdf->setparameter(pdf, "pagemap", mapping);
 	    pagenum++;
 	}
 	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
@@ -738,10 +740,16 @@ int main(int argn, char *argv[])
 	    frame++;
 	}
     }
+    if(pagerange && !pagenum && frame==1) {
+	fprintf(stderr, "No pages in range %s", pagerange);
+	exit(1);
+    }
 
     pagenum = 0;
 
     gfxdevice_t*out = create_output_device();;
+    pdf->prepare(pdf, out);
+
     for(pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
     {
 	if(is_in_range(pagenr, pagerange)) {