added doc

[swftools.git] / src / pdf2swf.c

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 41c9fe1..4526019 100644 (file)
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -28,15 +28,13 @@
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #include "../lib/args.h"
 #include "../lib/os.h"
 #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")
@@ -416,6 +414,7 @@ void args_callback_usage(char*name)
           "                           graphic errors)\n");
     printf("-s filloverlap             Make intersecting shapes overlap, instead of canceling each\n"
           "                           other out. (Needed for some Powerpoint PDFs)\n");
+    printf("-s transparent             Make the SWF transparent\n");
     //deliberately undocumented (for now)
     //printf("-2                         Put 2 pages into each frame.\n");
     //printf("-4                         Put 4 pages into each frame.\n");
@@ -485,26 +484,12 @@ int main(int argn, char *argv[])
     int nup_pos = 0;
     int x,y;
     char* installPath = getInstallationPath();
-    char* fontdir = 0;
     
     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");
-       FILE*test = fopen(concatPaths(fontdir,"\\d050000l.afm"), "rb");
-       if(!test) {
-           fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(fontdir, "\\d050000l.afm"));
-           perror("open");
-           exit(1);
-       }
-       fclose(test);
+       fontpaths[fontpathpos++] = concatPaths(installPath, "fonts");
     }
-#else
-    fontdir = concatPaths(installPath, "fonts");
-#endif
 
 #ifdef HAVE_SRAND48
     srand48(time(0));
@@ -513,8 +498,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,15 +530,15 @@ 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);
     }
 
     /* add fonts */
-    if(fontdir) {
-       driver->set_parameter("fontdir", fontdir);
-    }
     for(t=0;t<fontpathpos;t++) {
        driver->set_parameter("fontdir", fontpaths[t]);
     }
@@ -573,7 +560,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 +616,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 +657,7 @@ int main(int argn, char *argv[])
     }
     
     gfxresult_t*result = out->finish(out);
+
     if(result->save(result, outputname) < 0) {
         exit(1);
     }
@@ -682,44 +670,28 @@ int main(int argn, char *argv[])
 
     pdf->destroy(pdf);
 
-    char*zip = "";
-    if(zlib)
+    const char*zip = "";
+    if(zlib) {
        zip = "-z";
-#undef SYSTEM_BACKTICKS
-    if(viewer && !preloader) {
-#ifdef SYSTEM_BACKTICKS
-       systemf("swfcombine %s `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",zip,
-               viewer, outputname, outputname);
-#else
+    }
+    if(!preloader && viewer) {
        systemf("swfcombine %s -X %d -Y %d \"%s\" viewport=\"%s\" -o \"%s\"",zip,width,height,
                viewer, outputname, outputname);
-#endif
        if(!system_quiet)
            printf("\n");
     }
     if(preloader && !viewer) {
        msg("<warning> --preloader option without --viewer option doesn't make very much sense.");
-#ifdef SYSTEM_BACKTICKS
-       ret = systemf("swfcombine %s `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,
-               preloader, SWFDIR, preloader, outputname, outputname);
-#else
        ret = systemf("swfcombine %s -Y %d -X %d %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,width,height,
                SWFDIR, preloader, outputname, outputname);
-#endif
        if(!system_quiet)
            printf("\n");
     }
     if(preloader && viewer) {
        systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf",
-               viewer, outputname, outputname);
-#ifdef SYSTEM_BACKTICKS
-       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);
-#else
-       /* TODO: read out rate */
+               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), preloader, SWFDIR, preloader, outputname);
-#endif
+               getRate(preloader), SWFDIR, preloader, outputname);
        systemf("rm __tmp__.swf");
     }