synchronized with downstream git

[swftools.git] / src / pdf2swf.c

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 4255fbf..c50a3de 100644 (file)
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -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.
@@ -671,16 +673,16 @@ int main(int argn, char *argv[])
     if(pagerange)
        driver->set_parameter(driver, "pages", pagerange);
 
-    if(info_only) {
-       show_info(driver, filename);
-       return 0;
-    }
-
     /* add fonts */
     for(t=0;t<fontpathpos;t++) {
        driver->set_parameter(driver, "fontdir", fontpaths[t]);
     }
 
+    if(info_only) {
+       show_info(driver, filename);
+       return 0;
+    }
+
     char*u = 0;
     if((u = strchr(outputname, '%'))) {
        if(strchr(u+1, '%') || 
@@ -746,6 +748,8 @@ int main(int argn, char *argv[])
     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)) {