X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=39ad03f7d00f740d51038ab1b50b5f725f99f367;hb=d7fbdb443a256290300d1fdb0625daddf2aa6578;hp=a87c6e29765d7af6d0674bb7da44d029d3b367a7;hpb=a4b2f806a1e820a312f585c693b75cf2643ce9fe;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index a87c6e2..39ad03f 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -32,27 +32,24 @@
 #include <sys/stat.h>
 #endif
 #include "../lib/args.h"
+#include "../lib/os.h"
 #include "SWFOutputDev.h"
-extern "C" {
 #include "log.h"
-}
 
-#ifndef WIN32
-#define FONTDIR SWFTOOLS_DATADIR "/fonts"
-#define SWFDIR SWFTOOLS_DATADIR "/swfs"
-#else
-#define FONTDIR "C:\\swftools\\fonts"
-#define SWFDIR "C:\\swftools\\swfs"
-#endif
+#define FONTDIR concatPaths(getInstallationPath(), "fonts")
+#define SWFDIR concatPaths(getInstallationPath(), "swfs")
 
 static char * outputname = 0;
 static int loglevel = 3;
 static char * pagerange = 0;
 static char * filename = 0;
 static char * password = 0;
+static int zlib = 0;
 
 static char * preloader = 0;
 static char * viewer = 0;
+static int xnup = 1;
+static int ynup = 1;
 
 char* fontpaths[256];
 int fontpathpos = 0;
@@ -89,11 +86,31 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "v"))
     {
 	loglevel ++;
+        setConsoleLogging(loglevel);
+	return 0;
+    }
+    else if (!strcmp(name, "2"))
+    {
+        xnup = 2;
+        ynup = 1;
+	return 0;
+    }
+    else if (!strcmp(name, "4"))
+    {
+        xnup = 2;
+        ynup = 2;
+	return 0;
+    }
+    else if (!strcmp(name, "9"))
+    {
+        xnup = 3;
+        ynup = 3;
 	return 0;
     }
     else if (!strcmp(name, "q"))
     {
 	loglevel --;
+        setConsoleLogging(loglevel);
 	system_quiet = 1;
 	return 0;
     }
@@ -143,6 +160,7 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "z"))
     {
 	pdfswf_setparameter("enablezlib", "1");
+	zlib = 1;
 	return 0;
     }
     else if (!strcmp(name, "n"))
@@ -169,6 +187,11 @@ int args_callback_option(char*name,char*val) {
 	pdfswf_setparameter("storeallcharacters", "1");
 	return 0;
     }
+    else if (!strcmp(name, "w"))
+    {
+	pdfswf_setparameter("linksopennewwindow", "0");
+	return 0;
+    }
     else if (!strcmp(name, "F"))
     {
 	char *s = strdup(val);
@@ -333,85 +356,19 @@ 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");
+    //deliberately undocumented (for now)
+    //printf("-2                         Put 2 pages into each frame.\n");
+    //printf("-4                         Put 4 pages into each frame.\n");
     printf("Postprocessing options:\n");
 #ifndef SYSTEM_BACKTICKS
     printf("(They might not work because your system call doesn't support command substitution)\n");
-#endif
-    printf("-b  --defaultviewer        Link default viewer to the pdf (%s/swfs/default_viewer.swf)\n", SWFTOOLS_DATADIR);
-    printf("-l  --defaultpreloader     Link default preloader the pdf (%s/swfs/default_loader.swf)\n", SWFTOOLS_DATADIR);
+#endif  
+    printf("-b  --defaultviewer        Link default viewer to the pdf (%s)\n", concatPaths(SWFDIR, "default_viewer.swf"));
+    printf("-l  --defaultpreloader     Link default preloader the pdf (%s)\n", concatPaths(SWFDIR, "default_loader.swf"));
     printf("-B  --viewer=filename      Link viewer \"name\" to the pdf (\"%s -B\" for list)\n", name);
     printf("-L  --preloader=filename   Link preloader \"name\" to the pdf (\"%s -L\" for list)\n",name);
 }
 
-#ifdef HAVE_DIRENT_H
-void addfontdir(char* dirname, int*numfonts)
-{
-    if(!numfonts)
-	msg("<verbose> Adding %s to search path\n", dirname);
-
-    DIR*dir = opendir(dirname);
-    if(!dir) {
-	msg("<warning> Couldn't open directory %s\n", dirname);
-	return;
-    }
-    dirent*ent;
-    while(1) {
-	ent = readdir (dir);
-	if (!ent) 
-	    break;
-	int l;
-	char*name = ent->d_name;
-	char type = 0;
-	if(!name) continue;
-	l=strlen(name);
-	if(l<4)
-	    continue;
-	if(!strncasecmp(&name[l-4], ".pfa", 4)) 
-	    type=1;
-	if(!strncasecmp(&name[l-4], ".pfb", 4)) 
-	    type=3;
-	if(!strncasecmp(&name[l-4], ".ttf", 4)) 
-	    type=2;
-	if(type)
-	{
-	    char*fontname = (char*)malloc(strlen(dirname)+strlen(name)+2);
-	    strcpy(fontname, dirname);
-#ifdef WIN32
-		strcat(fontname, "\\");
-#else
-		strcat(fontname, "/");
-#endif
-	    strcat(fontname, name);
-	    if(!numfonts)
-		msg("<debug> Adding %s to fonts", fontname);
-	    pdfswf_addfont(fontname);
-	    if(numfonts)
-		(*numfonts)++;
-	}
-    }
-    closedir(dir);
-}
-#endif
-
-char* stripfilename(char*filename, char*newext)
-{
-    char*last1 = strrchr(filename, '/');
-    char*last2 = strrchr(filename, '\\');
-    char*pos = filename;
-    char*name;
-    char*dot;
-    if(last1>pos) pos = last1 + 1;
-    if(last2>pos) pos = last2 + 1;
-    name = (char*)malloc(strlen(pos)+5);
-    strcpy(name, pos);
-    dot = strrchr(name, '.');
-    if(dot) {
-	*dot = 0;
-    }
-    strcat(name, newext);
-    return name;
-}
-
 int main(int argn, char *argv[])
 {
     int ret;
@@ -419,11 +376,15 @@ int main(int argn, char *argv[])
     int numfonts = 0;
     int t;
     char t1searchpath[1024];
+    int nup_pos = 0;
+    int x,y;
+    
+    initLog(0,-1,0,0,-1,loglevel);
 
 #if defined(WIN32) && defined(HAVE_STAT) && defined(HAVE_SYS_STAT_H)
-    FILE*test = fopen(FONTDIR "\\d050000l.afm", "rb");
+    FILE*test = fopen(concatPaths(FONTDIR,"\\d050000l.afm"), "rb");
     if(!test) {
-	fprintf(stderr, "Couldn't find file " FONTDIR "\\d050000l.afm- pdf2swf not installed properly? OS says:\n");
+	fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(FONTDIR, "\\d050000l.afm"));
 	perror("open");
 	exit(1);
     }
@@ -438,7 +399,6 @@ int main(int argn, char *argv[])
 #endif
 #endif
     processargs(argn, argv);
-    initLog(0,-1,0,0,-1,loglevel);
 
     if(!filename)
     {
@@ -449,7 +409,7 @@ int main(int argn, char *argv[])
     if(!outputname)
     {
 	if(filename) {
-	    outputname = stripfilename(filename, ".swf");
+	    outputname = stripFilename(filename, ".swf");
 	    msg("<notice> Output filename not given. Writing to %s", outputname);
 	} 
     }
@@ -468,33 +428,118 @@ int main(int argn, char *argv[])
 	exit(0);
     }
 
-#ifdef HAVE_DIRENT_H
-    // pass 1
-    addfontdir(FONTDIR, &numfonts);
+    /* add fonts */
+    pdfswf_addfontdir(FONTDIR);
     for(t=0;t<fontpathpos;t++) {
-	addfontdir(fontpaths[t], &numfonts);
+	pdfswf_addfontdir(fontpaths[t]);
     }
-    // pass 2
-    addfontdir(FONTDIR, 0);
-    for(t=0;t<fontpathpos;t++) {
-	addfontdir(fontpaths[t], 0);
+
+    pdf_doc_t* pdf = pdf_init(filename, password);
+    if(!pdf) {
+        msg("<error> Couldn't open %s", filename);
+        exit(1);
+    }
+
+    swf_output_t* swf = swf_output_init();
+
+    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++;
+	}
     }
-#else
-    msg("<error> Couldn't find any fonts!");
-#endif
 
-    pdfswf_init(filename, password);
-    pdfswf_setoutputfilename(outputname);
+    pagenum = 0;
 
-    int pages = pdfswf_numpages();
-    for(t = 1; t <= pages; t++) 
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
     {
-	if(is_in_range(t, pagerange))
-	pdfswf_convertpage(t);
+	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);
     }
-    pdfswf_performconversion();
+    msg("<notice> SWF written");
+    swf_output_destroy(swf);
 
-    pdfswf_close();
+    pdf_destroy(pdf);
 
     if(viewer || preloader) {
 #ifndef SYSTEM_BACKTICKS
@@ -505,28 +550,66 @@ int main(int argn, char *argv[])
 	    printf("\n");
     }
 
+    char*zip = "";
+    if(zlib)
+	zip = "-z";
+
+#ifdef _WIN32
+    char*batchname = "_pdf2swf.bat";
+#endif
+
     if(viewer && !preloader) {
-	systemf("swfcombine `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",
+#ifdef _WIN32
+	system_quiet=1;
+	systemf("echo swfcombine %s \"%s\" viewport=\"%s\" -o \"%s\" ^^>%s",zip,
+		viewer, outputname, outputname, batchname);
+	systemf("swfdump -XY \"%s\">>%s", outputname, batchname);
+	systemf("call %s", batchname);
+	systemf("del %s", batchname);
+#else
+	systemf("swfcombine %s `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",zip,
 		outputname, 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.");
-	ret = systemf("swfcombine `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",
+#ifdef _WIN32
+	system_quiet=1;
+	systemf("echo @SET RATE=^^>%s", batchname);
+	systemf("swfdump -r \"%s\">>%s", preloader, batchname);
+	systemf("echo swfcombine %s %s\\PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\" %%RATE%%>>%s",zip,
+		SWFDIR, preloader, outputname, outputname, batchname);
+	systemf("call %s", batchname);
+	systemf("del %s", batchname);
+#else
+	systemf("swfcombine %s `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,
 		preloader, SWFDIR, preloader, outputname, outputname);
+#endif
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && viewer) {
 	systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf",
-		viewer, outputname, outputname);
-	systemf("swfcombine `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",
+		viewer, outputname);
+#ifdef _WIN32
+	system_quiet=1;
+	systemf("echo @SET X_AND_Y=^^>%s", batchname);
+	systemf("swfdump -XY \"%s\">>%s", outputname, batchname);
+	systemf("echo @SET RATE=^^>>%s", batchname);
+	systemf("swfdump -r \"%s\">>%s", preloader, batchname);
+	systemf("echo swfcombine %s %%X_AND_Y%% %%RATE%% %s\\PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\">>%s",zip,
+		SWFDIR, preloader, outputname, batchname);
+	systemf("call %s", batchname);
+	systemf("del __tmp__.swf %s", batchname);
+#else
+	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);
 	systemf("rm __tmp__.swf");
+#endif
     }
 
     return 0;
 }
 
-