X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=5558e4d0d66e948291bf3e32b9e737369e7becca;hb=39b4341a457d527eeef80e35ec5b4c27dd2fa96b;hp=84bd1feab64e20ad22e24c54c4998f76fcdb691b;hpb=d6224470857155687b11b1e3d4cfa13c6aba8b95;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 84bd1fe..5558e4d 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -39,7 +39,6 @@
 #include "SWFOutputDev.h"
 #include "log.h"
 
-#define FONTDIR concatPaths(getInstallationPath(), "fonts")
 #define SWFDIR concatPaths(getInstallationPath(), "swfs")
 
 static char * outputname = 0;
@@ -439,17 +438,24 @@ int main(int argn, char *argv[])
     char t1searchpath[1024];
     int nup_pos = 0;
     int x,y;
+    char* installPath = getInstallationPath();
+    char* fontdir = 0;
     
     initLog(0,-1,0,0,-1,loglevel);
 
 #if defined(WIN32) && defined(HAVE_STAT) && defined(HAVE_SYS_STAT_H)
-    FILE*test = fopen(concatPaths(FONTDIR,"\\d050000l.afm"), "rb");
-    if(!test) {
-	fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(FONTDIR, "\\d050000l.afm"));
-	perror("open");
-	exit(1);
+    if(installPath) {
+	fontdir = concatPaths(installPath, "fonts");
+	FILE*test = fopen(concatPaths(fontdir,"\\d050000l.afm"), "rb");
+	if(!test) {
+	    fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(fontdir, "\\d050000l.afm"));
+	    perror("open");
+	    exit(1);
+	}
+	fclose(test);
     }
-    fclose(test);
+#else
+    fontdir = concatPaths(installPath, "fonts");
 #endif
 
 #ifdef HAVE_SRAND48
@@ -490,7 +496,9 @@ int main(int argn, char *argv[])
     }
 
     /* add fonts */
-    pdfswf_addfontdir(FONTDIR);
+    if(fontdir) {
+	pdfswf_addfontdir(fontdir);
+    }
     for(t=0;t<fontpathpos;t++) {
 	pdfswf_addfontdir(fontpaths[t]);
     }
@@ -568,7 +576,11 @@ int main(int argn, char *argv[])
 		height += ymax[y];
 		ymax[y] = height;
 	    }
-	    dev_output_startframe(swf, width, height);
+	    if(custom_clip) {
+		dev_output_startframe(swf, clip_x2 - clip_x1, clip_y2 - clip_y1);
+	    } else {
+		dev_output_startframe(swf, width, height);
+	    }
 	    for(t=0;t<pagenum;t++) {
 		int x = t%xnup;
 		int y = t/xnup;