X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=21a19e6a212ee5bf780f770e3983a1552c0af97e;hb=fa9f93ed6eac01d72ba26e2e72d2ceee78ffd3f9;hp=ba0b66e6f09d8bb61744fd6e056158ec267da7d1;hpb=c32b62c37628a900047e324f7c65b6deac619eb6;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index ba0b66e..21a19e6 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>
@@ -89,7 +89,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 {
     FT_Face face;
     FT_Error error;
-    const char* name;
+    const char* name = 0;
     FT_ULong charcode;
     FT_UInt gindex;
     SWFFONT* font;
@@ -135,8 +135,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     font->layout->leading = -face->bbox.xMin;
     font->layout->kerningcount = 0;
     
+    name = FT_Get_Postscript_Name(face);
     if(name && *name)
-	font->name = (U8*)strdup(FT_Get_Postscript_Name(face));
+	font->name = (U8*)strdup(name);
 
 /*    // Map Glyphs to Unicode, version 1 (quick and dirty):
     int t;
@@ -243,7 +244,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
     return font;
 }
-#else  //USE_FREETYPE
+#else  //HAVE_FREETYPE
 
 SWFFONT* swf_LoadTrueTypeFont(char*filename)
 {
@@ -413,7 +414,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);
@@ -427,10 +428,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);