renamed arts device into "removeclippings"

[swftools.git] / src / pdf2swf.c

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 41c9fe1..6cd4923 100644 (file)
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -36,7 +36,8 @@
 #include "../lib/rfxswf.h"
 #include "../lib/devices/swf.h"
 #include "../lib/devices/arts.h"
-#include "../lib/xpdf/pdf.h"
+#include "../lib/devices/record.h"
+#include "../lib/pdf/pdf.h"
 #include "../lib/log.h"
 
 #define SWFDIR concatPaths(getInstallationPath(), "swfs")
@@ -489,8 +490,6 @@ int main(int argn, char *argv[])
     
     initLog(0,-1,0,0,-1,loglevel);
 
-    driver = gfxsource_pdf_create();
-
 #if defined(WIN32) && defined(HAVE_STAT) && defined(HAVE_SYS_STAT_H)
     if(installPath) {
        fontdir = concatPaths(installPath, "fonts");
@@ -513,8 +512,10 @@ int main(int argn, char *argv[])
     srand(time(0));
 #endif
 #endif
-    processargs(argn, argv);
+    driver = gfxsource_pdf_create();
 
+    processargs(argn, argv);
+    
     if(!filename)
     {
        fprintf(stderr, "Please specify an input file\n");
@@ -543,6 +544,9 @@ int main(int argn, char *argv[])
     // test if the page range is o.k.
     is_in_range(0x7fffffff, pagerange);
 
+    if(pagerange)
+       driver->set_parameter("pages", pagerange);
+
     if (!filename) {
        args_callback_usage(argv[0]);
        exit(0);
@@ -573,7 +577,7 @@ int main(int argn, char *argv[])
     gfxdevice_t*out;
     
     if(flatten) {
-       gfxdevice_arts_init(&wrap, &swf);
+       gfxdevice_removeclippings_init(&wrap, &swf);
        out = &wrap;
     } else {
        out = &swf;
@@ -629,9 +633,9 @@ int main(int argn, char *argv[])
                int t = y*xnup + x;
 
                if(pages[t].page->width > xmax[x])
-                   xmax[x] = pages[t].page->width;
+                   xmax[x] = (int)pages[t].page->width;
                if(pages[t].page->height > ymax[y])
-                   ymax[y] = pages[t].page->height;
+                   ymax[y] = (int)pages[t].page->height;
            }
            for(x=0;x<xnup;x++) {
                width += xmax[x];
@@ -670,6 +674,7 @@ int main(int argn, char *argv[])
     }
     
     gfxresult_t*result = out->finish(out);
+
     if(result->save(result, outputname) < 0) {
         exit(1);
     }