X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=f355829a883abd5f569bf38b10b9ed04cee81460;hb=714b122c75a757dcd1ef9a631aa209a298e650d7;hp=f2727a462571a9653efcb8aaba2ab59014ba4537;hpb=e38d3a125e8bb4459e26cc4b42ee63f010c56ffb;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index f2727a4..f355829 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,7 +21,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef USE_FREETYPE
+#ifdef HAVE_FREETYPE
 
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
@@ -244,7 +244,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
     return font;
 }
-#else  //USE_FREETYPE
+#else  //HAVE_FREETYPE
 
 SWFFONT* swf_LoadTrueTypeFont(char*filename)
 {
@@ -300,7 +300,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
     memset(font, 0, sizeof(SWFFONT));
 
     font->version = 2;
-    font->name = (U8*)strdup(fontname);
+    if(fontname) 
+	font->name = (U8*)strdup(fontname);
+    else 
+	font->name = 0;
     font->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
     memset(font->layout, 0, sizeof(SWFLAYOUT));
 
@@ -414,7 +417,7 @@ static int isSWF(const char*filename)
     char a[8];
     if(!fi) {
 	perror(filename);
-	return 0;
+	return -1;
     }
     memset(a, 0, sizeof(a));
     fread(a, 4, 1, fi);
@@ -428,10 +431,13 @@ static int isSWF(const char*filename)
 
 SWFFONT* swf_LoadFont(char*filename)
 {
-    if(isSWF(filename)) {
+    int is_swf = isSWF(filename);
+    if(is_swf<0)
+	return 0;
+    if(is_swf) {
 	return swf_ReadFont(filename);
     }
-#if defined(USE_FREETYPE)
+#if defined(HAVE_FREETYPE)
     return swf_LoadTrueTypeFont(filename);
 #elif defined(HAVE_T1LIB)
     return swf_LoadT1Font(filename);