X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=3b67f4acd3dd66261d36159ccd71d097007d529b;hb=9f4a64632e644148d4daaa22d2a32c471e127486;hp=4881fa88ebf18d92badfc98242c4ea24c4475c57;hpb=6d8a3ac8cf107a7374fedb2fbb9d9fbca114e0d6;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 4881fa8..3b67f4a 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -33,6 +33,7 @@
 #endif
 #include "../lib/args.h"
 #include "../lib/os.h"
+#include "../lib/rfxswf.h"
 #include "SWFOutputDev.h"
 #include "log.h"
 
@@ -48,7 +49,8 @@ static int zlib = 0;
 
 static char * preloader = 0;
 static char * viewer = 0;
-static int nup = 0;
+static int xnup = 1;
+static int ynup = 1;
 
 char* fontpaths[256];
 int fontpathpos = 0;
@@ -90,12 +92,20 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "2"))
     {
-        nup = 2;
+        xnup = 2;
+        ynup = 1;
 	return 0;
     }
     else if (!strcmp(name, "4"))
     {
-        nup = 4;
+        xnup = 2;
+        ynup = 2;
+	return 0;
+    }
+    else if (!strcmp(name, "9"))
+    {
+        xnup = 3;
+        ynup = 3;
 	return 0;
     }
     else if (!strcmp(name, "q"))
@@ -360,6 +370,27 @@ void args_callback_usage(char*name)
     printf("-L  --preloader=filename   Link preloader \"name\" to the pdf (\"%s -L\" for list)\n",name);
 }
 
+float getRate(char*filename)
+{
+    int fi;
+    SWF swf;
+    fi = open(filename,O_RDONLY|O_BINARY);
+    if(fi<0) { 
+	char buffer[256];
+	sprintf(buffer, "Couldn't open %s", filename);
+        perror(buffer);
+        exit(1);
+    }
+    if(swf_ReadSWF(fi,&swf) < 0)
+    { 
+        fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename);
+        close(fi);
+        exit(1);
+    }
+    swf_FreeTags(&swf);
+    return swf.frameRate / 256.0;
+}
+
 int main(int argn, char *argv[])
 {
     int ret;
@@ -430,80 +461,148 @@ int main(int argn, char *argv[])
         msg("<error> Couldn't open %s", filename);
         exit(1);
     }
+
     swf_output_t* swf = swf_output_init();
 
-    for(t = 1; t <= pdf->num_pages; t++) 
+    struct mypage_t {
+	int x;
+	int y;
+	pdf_page_t*page;
+	pdf_page_info_t*info;
+    } pages[4];
+
+    int pagenum = 0;
+    int frame = 1;
+    
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
+    {
+	if(is_in_range(pagenr, pagerange)) {
+	    swf_output_preparepage(swf, pagenr, frame);
+	    pagenum++;
+	}
+	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
+	    pagenum = 0;
+	    frame++;
+	}
+    }
+
+    pagenum = 0;
+
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
     {
-	if(is_in_range(t, pagerange)) {
-            /* for links: FIXME */
-            pdfswf_preparepage(t);
-        }
-	if(is_in_range(t, pagerange)) {
-            pdf_page_t*page = pdf_getpage(pdf, t);
-            if(nup) {
-                pdf_page_info_t* info = pdf_page_getinfo(page);
-                if(nup_pos%nup == 0) {
-                    pdf_page_render(page, swf);
-                    x = info->xMax;
-                    y = info->yMax;
-                } else if(nup_pos%nup == 1) {
-                    pdf_page_rendersection(page, swf, x, 0, info->xMin+x, info->yMin, info->xMax+x, info->yMax);
-                } else if(nup_pos%nup == 2) {
-                    pdf_page_rendersection(page, swf, 0, y, info->xMin, info->yMin+y, info->xMax, info->yMax+y);
-                } else if(nup_pos%nup == 3) {
-                    pdf_page_rendersection(page, swf, x, y, info->xMin+x, info->yMin+y, info->xMax+x, info->yMax+y);
-                }
-                if(nup_pos % nup == nup-1)
-                    swf_output_pagefeed(swf);
-
-                pdf_page_info_destroy(info);
-            } else {
-                pdf_page_render(page, swf);
-                swf_output_pagefeed(swf);
-            }
-
-            pdf_page_destroy(page);
-        }
-        nup_pos++;
-    }
-    if(!swf_output_save(swf, outputname))
+	if(is_in_range(pagenr, pagerange)) {
+	    pdf_page_t* page = pages[pagenum].page = pdf_getpage(pdf, pagenr);
+            pdf_page_info_t* info = pdf_page_getinfo(page);
+	    pages[pagenum].x = 0;
+	    pages[pagenum].y = 0;
+	    pages[pagenum].info = info;
+	    pages[pagenum].page = page;
+	    pagenum++;
+	}
+	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
+
+	    int t;
+	    int xmax[xnup], ymax[xnup];
+	    int x,y;
+	    int width=0, height=0;
+
+	    memset(xmax, 0, xnup*sizeof(int));
+	    memset(ymax, 0, ynup*sizeof(int));
+
+	    for(y=0;y<ynup;y++)
+	    for(x=0;x<xnup;x++) {
+		int t = y*xnup + x;
+
+		if(pages[t].info->xMax-pages[t].info->xMin > xmax[x])
+		    xmax[x] = pages[t].info->xMax-pages[t].info->xMin;
+		if(pages[t].info->yMax-pages[t].info->yMin > ymax[y])
+		    ymax[y] = pages[t].info->yMax-pages[t].info->yMin;
+	    }
+	    for(x=0;x<xnup;x++) {
+		width += xmax[x];
+		xmax[x] = width;
+	    }
+	    for(y=0;y<ynup;y++) {
+		height += ymax[y];
+		ymax[y] = height;
+	    }
+	    swf_output_startframe(swf, width, height);
+	    for(t=0;t<pagenum;t++) {
+		int x = t%xnup;
+		int y = t/xnup;
+		int xpos = x>0?xmax[x-1]:0;
+		int ypos = y>0?ymax[y-1]:0;
+		pdf_page_info_t*info = pages[t].info;
+		xpos -= info->xMin;
+		ypos -= info->yMin;
+		msg("<verbose> Render (%d,%d)-(%d,%d) move:%d/%d\n",
+			info->xMin + xpos,
+			info->yMin + ypos,
+			info->xMax + xpos,
+			info->yMax + ypos, xpos, ypos);
+		pdf_page_rendersection(pages[t].page, swf, xpos, 
+			                                   ypos,
+							   info->xMin + xpos, 
+							   info->yMin + ypos, 
+							   info->xMax + xpos, 
+							   info->yMax + ypos);
+	    }
+	    swf_output_endframe(swf);
+	    for(t=0;t<pagenum;t++)  {
+                pdf_page_info_destroy(pages[t].info);
+		pdf_page_destroy(pages[t].page);
+	    }
+	    pagenum = 0;
+	}
+    }
+    if(swf_output_save(swf, outputname) < 0) {
         exit(1);
+    }
+    int width = (int)swf_output_get(swf, "width");
+    int height = (int)swf_output_get(swf, "height");
     msg("<notice> SWF written");
     swf_output_destroy(swf);
 
     pdf_destroy(pdf);
 
-    if(viewer || preloader) {
-#ifndef SYSTEM_BACKTICKS
-	msg("<warning> Not sure whether system() can handle command substitution");
-	msg("<warning> (According to config.h, it can't)");
-#endif
-	if(!system_quiet)
-	    printf("\n");
-    }
-
     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,
-		outputname, viewer, outputname, outputname);
+		viewer, outputname, outputname);
+#else
+	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 */
+	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
 	systemf("rm __tmp__.swf");
     }