X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=96f125b8354351ba42fd7c3462f54feb72a3b644;hb=eea310f329b7409684f825c92a58dcc22b1de506;hp=a47b91d94d1856a59d3ef7fc02df3345a6356f2e;hpb=d6fa2d6b7a322aed5ffb0cc029cb9432ea64e8db;p=swftools.git diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc index a47b91d..96f125b 100644 --- a/pdf2swf/pdf2swf.cc +++ b/pdf2swf/pdf2swf.cc @@ -32,16 +32,12 @@ #include #endif #include "../lib/args.h" +#include "../lib/os.h" #include "SWFOutputDev.h" #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; @@ -51,6 +47,7 @@ static char * password = 0; static char * preloader = 0; static char * viewer = 0; +static int nup = 0; char* fontpaths[256]; int fontpathpos = 0; @@ -90,6 +87,16 @@ int args_callback_option(char*name,char*val) { setConsoleLogging(loglevel); return 0; } + else if (!strcmp(name, "2")) + { + nup = 2; + return 0; + } + else if (!strcmp(name, "4")) + { + nup = 4; + return 0; + } else if (!strcmp(name, "q")) { loglevel --; @@ -333,35 +340,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); + 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); } -static 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; @@ -369,13 +360,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); } @@ -400,7 +393,7 @@ int main(int argn, char *argv[]) if(!outputname) { if(filename) { - outputname = stripfilename(filename, ".swf"); + outputname = stripFilename(filename, ".swf"); msg(" Output filename not given. Writing to %s", outputname); } } @@ -440,9 +433,31 @@ int main(int argn, char *argv[]) } if(is_in_range(t, pagerange)) { pdf_page_t*page = pdf_getpage(pdf, t); - pdf_page_render(page, swf); + 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)) exit(1);