X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=pdf2swf%2FSWFOutputDev.cc;h=5186af38a9964f6f3894fc8cfb0515ff33e8a659;hb=6bc6f6368354fb8d16e9a8fb005135a7ac5d16e8;hp=9fd6ee050b98a07f6c03b20cb72c858e3ab8ca08;hpb=87ebfebccfa1573b15b06930af15fbb693465a5c;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 9fd6ee0..5186af3 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -23,6 +23,12 @@
 #include <string.h>
 #include <unistd.h>
 #include "../config.h"
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 #ifdef HAVE_FONTCONFIG_H
 #include <fontconfig.h>
 #endif
@@ -1908,6 +1914,10 @@ void pdfswf_setparameter(char*name, char*value)
 	caplinewidth = atof(value);
     } else if(!strcmp(name, "zoom")) {
 	zoom = atoi(value);
+    } else if(!strcmp(name, "fontdir")) {
+        pdfswf_addfontdir(value);
+    } else if(!strcmp(name, "languagedir")) {
+        pdfswf_addlanguagedir(value);
     } else {
 	swfoutput_setparameter(name, value);
     }
@@ -1924,6 +1934,82 @@ void pdfswf_addfont(char*filename)
     }
 }
 
+static char* dirseparator()
+{
+#ifdef WIN32
+    return "\\";
+#else
+    return "/";
+#endif
+}
+
+void pdfswf_addlanguagedir(char*dir)
+{
+    if(!globalParams)
+        globalParams = new GlobalParams("");
+    
+    msg("<notice> Adding %s to language pack directories", dir);
+
+    int l;
+    FILE*fi = 0;
+    char* config_file = (char*)malloc(strlen(dir)+256);
+    strcpy(config_file, dir);
+    strcat(config_file, dirseparator());
+    strcat(config_file, "add-to-xpdfrc");
+
+    fi = fopen(config_file, "rb");
+    if(!fi) {
+        msg("<error> Could not open %s");
+        return;
+    }
+    globalParams->parseFile(new GString(config_file), fi);
+    fclose(fi);
+}
+
+void pdfswf_addfontdir(char*dirname)
+{
+#ifdef HAVE_DIRENT_H
+    msg("<notice> Adding %s to font directories", dirname);
+    DIR*dir = opendir(dirname);
+    if(!dir) {
+	msg("<warning> Couldn't open directory %s\n", dirname);
+	return;
+    }
+    struct 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);
+            strcat(fontname, dirseparator());
+	    strcat(fontname, name);
+	    msg("<verbose> Adding %s to fonts", fontname);
+	    pdfswf_addfont(fontname);
+	}
+    }
+    closedir(dir);
+#else
+    msg("<warning> No dirent.h- unable to add font dir %s");
+#endif
+}
+
+
 typedef struct _pdf_doc_internal
 {
     int protect;
@@ -1950,7 +2036,8 @@ pdf_doc_t* pdf_init(char*filename, char*userPassword)
     Object info;
 
     // read config file
-    globalParams = new GlobalParams("");
+    if(!globalParams)
+        globalParams = new GlobalParams("");
 
     // open PDF file
     if (userPassword && userPassword[0]) {
@@ -2027,7 +2114,7 @@ class MemCheck
 {
     public: ~MemCheck()
     {
-        delete globalParams;
+        delete globalParams;globalParams=0;
         Object::memCheck(stderr);
         gMemReport(stderr);
     }