swf_LoadFont() now returns more quickly if the file doesn't exist.

[swftools.git] / lib / modules / swffont.c

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index f2727a4..21a19e6 100644 (file)
--- 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)
 {
@@ -414,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);
@@ -428,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);