X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpdf2swf.c;h=15ba46a8f7a17de5cf36a745f065c17ef65fba48;hb=ec56b8f77559462e7ea5726ca8ac3305851265a3;hp=93628133ec93f1b9ad0ea908a021b6201386306a;hpb=79dda1a6768763e139d064ddedd1f733ad3dd238;p=swftools.git

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index 9362813..15ba46a 100644
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -36,6 +36,7 @@
 #include "../lib/rfxswf.h"
 #include "../lib/devices/swf.h"
 #include "../lib/devices/arts.h"
+#include "../lib/devices/record.h"
 #include "../lib/pdf/pdf.h"
 #include "../lib/log.h"
 
@@ -552,9 +553,10 @@ int main(int argn, char *argv[])
     }
 
     /* add fonts */
+    /*
     if(fontdir) {
 	driver->set_parameter("fontdir", fontdir);
-    }
+    }*/
     for(t=0;t<fontpathpos;t++) {
 	driver->set_parameter("fontdir", fontpaths[t]);
     }
@@ -576,7 +578,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;
@@ -673,6 +675,7 @@ int main(int argn, char *argv[])
     }
     
     gfxresult_t*result = out->finish(out);
+
     if(result->save(result, outputname) < 0) {
         exit(1);
     }
@@ -686,43 +689,27 @@ int main(int argn, char *argv[])
     pdf->destroy(pdf);
 
     char*zip = "";
-    if(zlib)
+    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");
     }