X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=285e2a715ed6476bbf70d099c628df53e532f99b;hb=6feed80959ad2c11f0427bf0e5a30aab8abd7083;hp=cff67d0e48ad9edda23c8a4bccbcaefe9c1787ea;hpb=082570277b68944ec839a2bdce5ab93fbbf2d949;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index cff67d0..285e2a7 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -3,9 +3,21 @@
 
    Part of the swftools package.
    
-   Copyright (c) 2001 Matthias Kramm <kramm@quiss.org> 
-
-   This file is distributed under the GPL, see file COPYING for details */
+   Copyright (c) 2001,2002,2003 Matthias Kramm <kramm@quiss.org> 
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -325,11 +337,11 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
 	    strcat(searchpath, ":");
 	strcat(searchpath, dirname);
     }
-    logf("<verbose> Adding %s to search path\n", dirname);
+    msg("<verbose> Adding %s to search path\n", dirname);
 
     DIR*dir = opendir(dirname);
     if(!dir) {
-	logf("<warning> Couldn't open directory %s\n", dirname);
+	msg("<warning> Couldn't open directory %s\n", dirname);
 	return;
     }
     dirent*ent;
@@ -356,10 +368,10 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
 		sprintf(buf, "%s/%s", dirname,name);
 		fi = fopen(buf, "rb");
 		if(!fi || !fread(&a,1,1,fi)) {
-		    logf("<warning> Couldn't read from %s", buf);
+		    msg("<warning> Couldn't read from %s", buf);
 		}
 		fprintf(database, "%s\n", buf);
-		logf("<verbose> Found font %s\n", buf);
+		msg("<verbose> Found font %s\n", buf);
 		fclose(fi);
 	    } 
 	    if(numfonts)
@@ -416,7 +428,7 @@ int main(int argn, char *argv[])
     {
 	if(filename) {
 	    outputname = stripfilename(filename, ".swf");
-	    logf("<notice> Output filename not given. Writing to %s", outputname);
+	    msg("<notice> Output filename not given. Writing to %s", outputname);
 	} 
     }
 	
@@ -434,7 +446,7 @@ int main(int argn, char *argv[])
 	exit(0);
     }
 
-    logf("<verbose> reading font files from %s/fonts\n", SWFTOOLS_DATADIR);
+    msg("<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");
@@ -510,8 +522,8 @@ int main(int argn, char *argv[])
 
     if(viewer || preloader) {
 #ifndef SYSTEM_BACKTICKS
-	logf("<warning> Not sure whether system() can handle command substitution");
-	logf("<warning> (According to config.h, it can't)");
+	msg("<warning> Not sure whether system() can handle command substitution");
+	msg("<warning> (According to config.h, it can't)");
 #endif
 	if(!system_quiet)
 	    printf("\n");
@@ -524,7 +536,7 @@ int main(int argn, char *argv[])
 	    printf("\n");
     }
     if(preloader && !viewer) {
-	logf("<warning> --preloader option without --viewer option doesn't make very much sense.");
+	msg("<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, SWFTOOLS_DATADIR, preloader, outputname, outputname);
 	if(!system_quiet)