X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=a47b91d94d1856a59d3ef7fc02df3345a6356f2e;hb=607c5dadd6089768b618cc99346de1b37a2c46f1;hp=824657b5894c7059ff9a0c6e34b03cdcc6cf69e1;hpb=c71ce9b62dc70d2ab901f642000e5929c692314e;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 824657b..a47b91d 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -33,9 +33,7 @@
 #endif
 #include "../lib/args.h"
 #include "SWFOutputDev.h"
-extern "C" {
 #include "log.h"
-}
 
 #ifndef WIN32
 #define FONTDIR SWFTOOLS_DATADIR "/fonts"
@@ -89,11 +87,13 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "v"))
     {
 	loglevel ++;
+        setConsoleLogging(loglevel);
 	return 0;
     }
     else if (!strcmp(name, "q"))
     {
 	loglevel --;
+        setConsoleLogging(loglevel);
 	system_quiet = 1;
 	return 0;
     }
@@ -343,57 +343,7 @@ void args_callback_usage(char*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)
+static char* stripfilename(char*filename, char*newext)
 {
     char*last1 = strrchr(filename, '/');
     char*last2 = strrchr(filename, '\\');
@@ -419,6 +369,8 @@ int main(int argn, char *argv[])
     int numfonts = 0;
     int t;
     char t1searchpath[1024];
+    
+    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");
@@ -438,7 +390,6 @@ int main(int argn, char *argv[])
 #endif
 #endif
     processargs(argn, argv);
-    initLog(0,-1,0,0,-1,loglevel);
 
     if(!filename)
     {
@@ -468,20 +419,11 @@ int main(int argn, char *argv[])
 	exit(0);
     }
 
-#ifdef HAVE_DIRENT_H
-    // pass 1
-    addfontdir(FONTDIR, &numfonts);
-    for(t=0;t<fontpathpos;t++) {
-	addfontdir(fontpaths[t], &numfonts);
-    }
-    // pass 2
-    addfontdir(FONTDIR, 0);
+    /* add fonts */
+    pdfswf_addfontdir(FONTDIR);
     for(t=0;t<fontpathpos;t++) {
-	addfontdir(fontpaths[t], 0);
+	pdfswf_addfontdir(fontpaths[t]);
     }
-#else
-    msg("<error> Couldn't find any fonts!");
-#endif
 
     pdf_doc_t* pdf = pdf_init(filename, password);
     if(!pdf) {
@@ -502,7 +444,8 @@ int main(int argn, char *argv[])
             pdf_page_destroy(page);
         }
     }
-    swf_output_save(swf, outputname);
+    if(!swf_output_save(swf, outputname))
+        exit(1);
     swf_output_destroy(swf);
 
     pdf_destroy(pdf);
@@ -540,4 +483,3 @@ int main(int argn, char *argv[])
     return 0;
 }
 
-