fix for t1lib-5.0.0

[swftools.git] / pdf2swf / pdf2swf.cc

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index dcce5f8..4cec4f5 100644 (file)
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -147,14 +147,14 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "l"))
     {
        char buf[256];
-       sprintf(buf, "%s/swfs/default_loader.swf", DATADIR);
+       sprintf(buf, "%s/swfs/default_loader.swf", SWFTOOLS_DATADIR);
        preloader = strdup(buf);
        return 0;
     }
     else if (!strcmp(name, "b"))
     {
        char buf[256];
-       sprintf(buf, "%s/swfs/default_viewer.swf", DATADIR);
+       sprintf(buf, "%s/swfs/default_viewer.swf", SWFTOOLS_DATADIR);
        viewer = strdup(buf);
        return 0;
     }
@@ -166,7 +166,7 @@ int args_callback_option(char*name,char*val) {
        }
        else
        {
-           systemf("ls %s/swfs/*_loader.swf", DATADIR);
+           systemf("ls %s/swfs/*_loader.swf", SWFTOOLS_DATADIR);
            if(!system_quiet)
                printf("\n");
            exit(1);
@@ -181,7 +181,7 @@ int args_callback_option(char*name,char*val) {
        }
        else
        {
-           systemf("ls %s/swfs/*_viewer.swf", DATADIR);
+           systemf("ls %s/swfs/*_viewer.swf", SWFTOOLS_DATADIR);
            if(!system_quiet)
                printf("\n");
            exit(1);
@@ -239,7 +239,7 @@ struct options_t options[] =
  {"p","pages"},
  {"w","samewindow"},
  {"f","fonts"},
- {"F","fontpath"},
+ {"F","fontdir"},
  {"B","viewer"},
  {"L","preloader"},
  {"b","defaultviewer"},
@@ -270,7 +270,7 @@ int args_callback_command(char*name, char*val) {
 
 void args_callback_usage(char*name)
 {
-    printf("Usage: %s [-si] [-j quality] [-p range] [-P password] input.pdf -o output.swf\n", name);
+    printf("Usage: %s [-si] [-j quality] [-p range] [-P password] input.pdf [-o output.swf]\n", name);
     printf("\n");
     printf("-p  --pages=range          Convert only pages in range\n");
     printf("-P  --password=password    Use password for deciphering the pdf\n");
@@ -282,7 +282,7 @@ void args_callback_usage(char*name)
     printf("-v  --verbose              Be verbose. Use more than one -v for greater effect\n");
     printf("-q  --quiet                Suppress normal messages. Use -qq to suppress warnings, also.\n");
     printf("-w  --samewindow           Don't open a new Browser Window for Links in the SWF\n");
-#ifdef HAVE_DIRENT
+#ifdef HAVE_DIRENT_H
     printf("-F  --fontdir directory    Add directory to font search path\n");
 #endif
     printf("-f  --fonts                Store full fonts in SWF. (Don't reduce to used characters)\n");
@@ -292,8 +292,8 @@ void args_callback_usage(char*name)
 #ifndef SYSTEM_BACKTICKS
     printf("The following 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", DATADIR);
-    printf("-l  --defaultpreloader     Link default preloader the pdf (%s/swfs/default_loader.swf)\n", DATADIR);
+    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  --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);
 }
@@ -341,6 +341,7 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
                }
                fprintf(database, "%s\n", buf);
                logf("<verbose> Found font %s\n", buf);
+               fclose(fi);
            } 
            if(numfonts)
                (*numfonts)++;
@@ -350,6 +351,25 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
 }
 #endif
 
+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;
@@ -368,6 +388,14 @@ int main(int argn, char *argv[])
     initLog(0,-1,0,0,-1,loglevel);
     if(!outputname)
     {
+       if(filename) {
+           outputname = stripfilename(filename, ".swf");
+           logf("<notice> Output filename not giving. Writing to %s", outputname);
+       } 
+    }
+       
+    if(!outputname)
+    {
        fprintf(stderr, "Please use -o to specify an output file\n");
        exit(1);
     }
@@ -380,7 +408,7 @@ int main(int argn, char *argv[])
        exit(0);
     }
 
-    logf("<verbose> reading font files from %s/fonts\n", DATADIR);
+    logf("<verbose> 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");
@@ -392,7 +420,7 @@ int main(int argn, char *argv[])
     }
     t1searchpath[0] = 0;
 #ifdef HAVE_DIRENT_H
-    sprintf(buf, "%s/fonts",DATADIR);
+    sprintf(buf, "%s/fonts",SWFTOOLS_DATADIR);
     // pass 1
     addfontdir(0, buf, &numfonts, 0);
     for(t=0;t<fontpathpos;t++) {
@@ -408,7 +436,7 @@ int main(int argn, char *argv[])
 /* This is a workaround. The correct way would be to
    get directory listings working on all systems.
 */
-    strcpy(t1searchpath, DATADIR);
+    strcpy(t1searchpath, SWFTOOLS_DATADIR);
     strcat(t1searchpath, "/fonts");
     fprintf(db, "14\n");
     fprintf(db, "n021003l.afm\n");
@@ -472,7 +500,7 @@ int main(int argn, char *argv[])
     if(preloader && !viewer) {
        logf("<warning> --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, DATADIR, preloader, outputname, outputname);
+               preloader, SWFTOOLS_DATADIR, preloader, outputname, outputname);
        if(!system_quiet)
            printf("\n");
     }
@@ -480,7 +508,7 @@ int main(int argn, char *argv[])
        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, DATADIR, preloader, outputname);
+               outputname, preloader, SWFTOOLS_DATADIR, preloader, outputname);
        systemf("rm __tmp__.swf");
     }