X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=739deb848e9da1b0d9d6c6c72802e7b5df81dbdd;hb=11ad4fc1ce7b6582c8dbf1a99df89a1d5d25a0de;hp=285e2a715ed6476bbf70d099c628df53e532f99b;hpb=aee9de2c6eb23628e54b6896f5b441d9b39317c1;p=swftools.git diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc index 285e2a7..739deb8 100644 --- a/pdf2swf/pdf2swf.cc +++ b/pdf2swf/pdf2swf.cc @@ -28,13 +28,23 @@ #ifdef HAVE_DIRENT_H #include #endif +#ifdef HAVE_SYS_STAT_H +#include +#endif #include "../lib/args.h" #include "SWFOutputDev.h" -#include "t1lib.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 + static char * outputname = 0; static int loglevel = 3; static char * pagerange = 0; @@ -172,14 +182,14 @@ int args_callback_option(char*name,char*val) { else if (!strcmp(name, "l")) { char buf[256]; - sprintf(buf, "%s/swfs/default_loader.swf", SWFTOOLS_DATADIR); + sprintf(buf, "%s/default_loader.swf", SWFDIR); preloader = strdup(buf); return 0; } else if (!strcmp(name, "b")) { char buf[256]; - sprintf(buf, "%s/swfs/default_viewer.swf", SWFTOOLS_DATADIR); + sprintf(buf, "%s/default_viewer.swf", SWFDIR); viewer = strdup(buf); return 0; } @@ -191,7 +201,7 @@ int args_callback_option(char*name,char*val) { } else { - systemf("ls %s/swfs/*_loader.swf", SWFTOOLS_DATADIR); + systemf("ls %s/*_loader.swf", SWFDIR); if(!system_quiet) printf("\n"); exit(1); @@ -206,7 +216,7 @@ int args_callback_option(char*name,char*val) { } else { - systemf("ls %s/swfs/*_viewer.swf", SWFTOOLS_DATADIR); + systemf("ls %s/*_viewer.swf", SWFDIR); if(!system_quiet) printf("\n"); exit(1); @@ -330,14 +340,10 @@ void args_callback_usage(char*name) } #ifdef HAVE_DIRENT_H -void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath) +void addfontdir(char* dirname, int*numfonts) { - if(searchpath) { - if(searchpath[0]) - strcat(searchpath, ":"); - strcat(searchpath, dirname); - } - msg(" Adding %s to search path\n", dirname); + if(!numfonts) + msg(" Adding %s to search path\n", dirname); DIR*dir = opendir(dirname); if(!dir) { @@ -356,24 +362,25 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath) l=strlen(name); if(l<4) continue; - if(!strncasecmp(&name[l-4], ".afm", 4)) + 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) { - if(database && type==1) { - char buf[256],a; - FILE*fi; - sprintf(buf, "%s/%s", dirname,name); - fi = fopen(buf, "rb"); - if(!fi || !fread(&a,1,1,fi)) { - msg(" Couldn't read from %s", buf); - } - fprintf(database, "%s\n", buf); - msg(" Found font %s\n", buf); - fclose(fi); - } + 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(" Adding %s to fonts", fontname); + pdfswf_addfont(fontname); if(numfonts) (*numfonts)++; } @@ -408,6 +415,17 @@ int main(int argn, char *argv[]) int numfonts = 0; int t; char t1searchpath[1024]; + +#if defined(WIN32) && defined(HAVE_STAT) && defined(HAVE_SYS_STAT_H) + FILE*test = fopen(FONTDIR "\\d050000l.afm", "rb"); + if(!test) { + fprintf(stderr, "Couldn't find file " FONTDIR "\\d050000l.afm- pdf2swf not installed properly? OS says:\n"); + perror("open"); + exit(1); + } + fclose(test); +#endif + #ifdef HAVE_SRAND48 srand48(time(0)); #else @@ -446,67 +464,21 @@ int main(int argn, char *argv[]) exit(0); } - msg(" reading font files from %s/fonts\n", SWFTOOLS_DATADIR); - //TODO: use tempnam here. Check if environment already contains a - //T1LIB_CONFIG. - putenv( "T1LIB_CONFIG=/tmp/t1lib.config.tmp"); - FILE*db = fopen("/tmp/FontDataBase", "wb"); - FILE*fi = fopen("/tmp/t1lib.config.tmp", "wb"); - if(!db || !fi) { - fprintf(stderr, "Couldn't create temporary file in /tmp/\n"); - exit(1); - } - t1searchpath[0] = 0; #ifdef HAVE_DIRENT_H - sprintf(buf, "%s/fonts",SWFTOOLS_DATADIR); // pass 1 - addfontdir(0, buf, &numfonts, 0); + addfontdir(FONTDIR, &numfonts); for(t=0;t Couldn't find any fonts!"); #endif - fprintf(fi, "FONTDATABASE=/tmp/FontDataBase\n"); - fprintf(fi, "ENCODING=%s:.\n", t1searchpath); - fprintf(fi, "AFM=%s:.\n", t1searchpath); - fprintf(fi, "TYPE1=%s:.\n", t1searchpath); - fclose(fi); - fclose(db); - /* initialize t1lib */ - T1_SetBitmapPad( 16); - if ((T1_InitLib(NO_LOGFILE)==NULL)){ - fprintf(stderr, "Initialization of t1lib failed\n"); - exit(1); - } - unlink("/tmp/t1lib.config.tmp"); - pdfswf_init(filename, password); pdfswf_setoutputfilename(outputname); @@ -530,27 +502,26 @@ int main(int argn, char *argv[]) } if(viewer && !preloader) { - systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s", + systemf("swfcombine `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"", outputname, viewer, outputname, outputname); if(!system_quiet) printf("\n"); } if(preloader && !viewer) { msg(" --preloader option without --viewer option doesn't make very much sense."); - ret = systemf("swfcombine `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=%s -o %s", - preloader, SWFTOOLS_DATADIR, preloader, outputname, outputname); + ret = systemf("swfcombine `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"", + preloader, SWFDIR, preloader, outputname, outputname); if(!system_quiet) printf("\n"); } if(preloader && viewer) { - systemf("swfcombine %s viewport=%s -o __tmp__.swf", + systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf", viewer, outputname, outputname); - systemf("swfcombine `swfdump -XY %s` `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o %s", - outputname, preloader, SWFTOOLS_DATADIR, preloader, outputname); + systemf("swfcombine `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"", + outputname, preloader, SWFDIR, preloader, outputname); systemf("rm __tmp__.swf"); } - unlink("/tmp/FontDataBase"); return 0; }