fixed format warnings
[swftools.git] / lib / modules / swffont.c
index f2727a4..986c07d 100644 (file)
    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
+#include <stdio.h>
+#include <stdlib.h>
+#include "../rfxswf.h"
 
+static int loadfont_scale = 4;
+static int skip_unused = 1;
+static int full_unicode = 0;
+
+void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
+{
+    if(_scale) loadfont_scale = _scale;
+    skip_unused = _skip_unused;
+    full_unicode = _full_unicode;
+}
+
+#ifdef HAVE_FREETYPE
+
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_SIZES_H
+#include FT_SFNT_NAMES_H
+#include FT_TRUETYPE_IDS_H
+#include FT_OUTLINE_H
+#else
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
 #include <freetype/ftsnames.h>
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
+#endif
+
+/* Setting subpixels to 64 also means that the "point size" of the
+   font outlines will be 64. So the font, when rendered at original
+   size (i.e., the swf fontsize is 1024) will have the same size as
+   if it was rendered at 64pt */
 
 #define FT_SCALE 1
 #define FT_SUBPIXELS 64
 
-static int ft_move_to(FT_Vector* _to, void* user) 
+static int ft_move_to(const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
@@ -41,7 +72,7 @@ static int ft_move_to(FT_Vector* _to, void* user)
     draw->moveTo(draw, &to);
     return 0;
 }
-static int ft_line_to(FT_Vector* _to, void* user) 
+static int ft_line_to(const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
@@ -50,28 +81,28 @@ static int ft_line_to(FT_Vector* _to, void* user)
     draw->lineTo(draw, &to);
     return 0;
 }
-static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* user)
+static int ft_conic_to(const FT_Vector* _c, const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
-    FPOINT c1,c2,to;
+    FPOINT c,to;
     to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
     to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
-    draw_cubicTo(draw, &c1, &c2, &to);
+    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
+    draw_conicTo(draw, &c, &to);
     return 0;
 }
-static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user) 
+static int ft_cubic_to(const FT_Vector* _c1, const FT_Vector* _c2, const FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
-    FPOINT c,to;
+    FPOINT c1,c2,to;
     to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
     to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
-    draw_conicTo(draw, &c, &to);
+    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
+    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
+    draw_cubicTo(draw, &c1, &c2, &to);
     return 0;
 }
 static FT_Outline_Funcs outline_functions =
@@ -85,7 +116,7 @@ static FT_Outline_Funcs outline_functions =
 
 static FT_Library ftlibrary = 0;
 
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename, char flashtype)
 {
     FT_Face face;
     FT_Error error;
@@ -94,7 +125,10 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_UInt gindex;
     SWFFONT* font;
     int t;
-   
+    int*glyph2glyph;
+    int max_unicode = 0;
+    int charmap = -1;
+
     if(ftlibrary == 0) {
        if(FT_Init_FreeType(&ftlibrary)) {
            fprintf(stderr, "Couldn't init freetype library!\n");
@@ -102,98 +136,151 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        }
     }
     error = FT_New_Face(ftlibrary, filename, 0, &face);
-    if(error) {
+
+    if(error || !face) {
        fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
        return 0;
     }
-    if(face->num_glyphs <= 0)
+   
+    int scale = flashtype?20:1;
+    FT_Set_Pixel_Sizes (face, 16*loadfont_scale*scale, 16*loadfont_scale*scale);
+
+    if(face->num_glyphs <= 0) {
+       fprintf(stderr, "File %s contains %d glyphs\n", filename, (int)face->num_glyphs);
        return 0;
+    }
 
-    font = malloc(sizeof(SWFFONT));
-    memset(font, 0, sizeof(SWFFONT));
+    font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
     font->id = -1;
-    font->version = 2;
-    font->layout = malloc(sizeof(SWFLAYOUT));
-    memset(font->layout, 0, sizeof(SWFLAYOUT));
-    font->layout->bounds = malloc(face->num_glyphs*sizeof(SRECT));
-    font->numchars = face->num_glyphs;
+    font->version = flashtype?3:2;
+
+    font->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT));
+    font->layout->bounds = (SRECT*)rfx_calloc(face->num_glyphs*sizeof(SRECT));
     font->style =  ((face->style_flags&FT_STYLE_FLAG_ITALIC)?FONT_STYLE_ITALIC:0)
                  |((face->style_flags&FT_STYLE_FLAG_BOLD)?FONT_STYLE_BOLD:0);
     font->encoding = FONT_ENCODING_UNICODE;
-    font->glyph2ascii = malloc(face->num_glyphs*sizeof(U16));
-    memset(font->glyph2ascii, 0, face->num_glyphs*sizeof(U16));
+    font->glyph2ascii = (U16*)rfx_calloc(face->num_glyphs*sizeof(U16));
     font->maxascii = 0;
-    memset(font->ascii2glyph, -1, font->maxascii*sizeof(int));
-    font->glyph = malloc(face->num_glyphs*sizeof(SWFGLYPH));
-    memset(font->glyph, 0, face->num_glyphs*sizeof(U16));
+    font->glyph = (SWFGLYPH*)rfx_calloc(face->num_glyphs*sizeof(SWFGLYPH));
     if(FT_HAS_GLYPH_NAMES(face)) {
-       font->glyphnames = malloc(face->num_glyphs*sizeof(char*));
+       font->glyphnames = (char**)rfx_calloc(face->num_glyphs*sizeof(char*));
     }
-
-    font->layout->ascent = face->ascender; //face->bbox.xMin;
-    font->layout->descent = face->descender; //face->bbox.xMax;
-    font->layout->leading = -face->bbox.xMin;
+    
     font->layout->kerningcount = 0;
     
-    name = FT_Get_Postscript_Name(face);
+    name = face->family_name;
+    if(!(name && *name))
+        name = FT_Get_Postscript_Name(face);
     if(name && *name)
        font->name = (U8*)strdup(name);
 
-/*    // Map Glyphs to Unicode, version 1 (quick and dirty):
-    int t;
-    for(t=0;t<65536;t++) {
-       int index = FT_Get_Char_Index(face, t);
-       if(index>=0 && index<face->num_glyphs) {
-           if(font->glyph2ascii[index]<0)
-               font->glyph2ascii[index] = t;
-       }
-    }*/
-    
-    // Map Glyphs to Unicode, version 2 (much nicer):
-    // (The third way would be the AGL algorithm, as proposed
-    //  by Werner Lemberg on freetype@freetype.org)
-
-    charcode = FT_Get_First_Char(face, &gindex);
-    while(gindex != 0)
+    while(1) 
     {
-       if(gindex >= 0 && gindex<face->num_glyphs) {
-           if(!font->glyph2ascii[gindex]) {
-               font->glyph2ascii[gindex] = charcode;
-               if(charcode + 1 > font->maxascii) {
-                   font->maxascii = charcode + 1;
+    /*    // Map Glyphs to Unicode, version 1 (quick and dirty):
+       int t;
+       for(t=0;t<65536;t++) {
+           int index = FT_Get_Char_Index(face, t);
+           if(index>=0 && index<face->num_glyphs) {
+               if(font->glyph2ascii[index]<0)
+                   font->glyph2ascii[index] = t;
+           }
+       }*/
+       
+       // Map Glyphs to Unicode, version 2 (much nicer):
+       // (The third way would be the AGL algorithm, as proposed
+       //  by Werner Lemberg on freetype@freetype.org)
+
+       charcode = FT_Get_First_Char(face, &gindex);
+       while(gindex != 0)
+       {
+           if(gindex >= 0 && gindex<face->num_glyphs) {
+               if(!font->glyph2ascii[gindex]) {
+                   font->glyph2ascii[gindex] = charcode;
+                   if(charcode + 1 > font->maxascii) {
+                       font->maxascii = charcode + 1;
+                   }
                }
            }
+           charcode = FT_Get_Next_Char(face, charcode, &gindex);
        }
-       charcode = FT_Get_Next_Char(face, charcode, &gindex);
+
+       /* if we didn't find a single encoding character, try
+          the font's charmaps instead. That usually means that
+          the encoding is no longer unicode. 
+          TODO: find a way to convert the encoding to unicode
+        */
+       if(font->maxascii == 0 && charmap < face->num_charmaps - 1) {
+           charmap++;
+           FT_Set_Charmap(face, face->charmaps[charmap]);
+           font->encoding = 0;//anything but unicode FIXME
+       } else 
+           break;
     }
+
+    if(full_unicode)
+       font->maxascii = 65535;
     
-    font->ascii2glyph = malloc(font->maxascii*sizeof(int));
+    font->ascii2glyph = (int*)rfx_calloc(font->maxascii*sizeof(int));
     
     for(t=0;t<font->maxascii;t++) {
-       font->ascii2glyph[t] = FT_Get_Char_Index(face, t);
-       if(!font->ascii2glyph[t])
-           font->ascii2glyph[t] = -1;
+       int g = FT_Get_Char_Index(face, t);
+       if(!g || g>=face->num_glyphs)
+           g = -1;
+       font->ascii2glyph[t] = g;
+       if(g>=0) {
+           max_unicode = t+1;
+           if(!font->glyph2ascii[g]) {
+               font->glyph2ascii[g] = t;
+           }
+       }
     }
+    font->maxascii = max_unicode;
+
+    font->numchars = 0;
+
+    glyph2glyph = (int*)rfx_calloc(face->num_glyphs*sizeof(int));
+
+    SRECT fontbbox = {0,0,0,0};
 
     for(t=0; t < face->num_glyphs; t++) {
        FT_Glyph glyph;
        FT_BBox bbox;
-       FT_Matrix matrix;
        char name[128];
        drawer_t draw;
-       int ret;
+       char hasname = 0;
        name[0]=0;
        if(FT_HAS_GLYPH_NAMES(face)) {
            error = FT_Get_Glyph_Name(face, t, name, 127);
-           if(!error) 
-               font->glyphnames[t] = strdup(name);
+           if(!error && name[0] && !strstr(name, "notdef")) {
+               font->glyphnames[font->numchars] = strdup(name);
+               hasname = 1;
+           }
+       }
+       if(!font->glyph2ascii[t] && !hasname && skip_unused) {
+           continue;
+       }
+       error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP);
+       if(error) {
+           //tends to happen with some pdfs
+           fprintf(stderr, "Warning: Glyph %d has return code %d\n", t, error);
+           glyph=0;
+           if(skip_unused) 
+               continue;
+       } else {
+           error = FT_Get_Glyph(face->glyph, &glyph);
+           if(error) {
+               fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
+               glyph=0;
+               if(skip_unused) 
+                   continue;
+           }
        }
-       error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
-       if(error) return 0;
-       error = FT_Get_Glyph(face->glyph, &glyph);
-       if(error) return 0;
 
-       FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+       if(glyph)
+           FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+       else
+           memset(&bbox, 0, sizeof(bbox));
+
        bbox.yMin = -bbox.yMin;
        bbox.yMax = -bbox.yMax;
        if(bbox.xMax < bbox.xMin) {
@@ -212,41 +299,88 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        swf_Shape01DrawerInit(&draw, 0);
 
        //error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
-       error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
-       if(error) return 0;
-
+       if(glyph)
+           error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
+       else
+           error = 0;
        draw.finish(&draw);
+       
+       if(error) {
+           fprintf(stderr, "Couldn't decompose glyph %d\n", t);
+           draw.dealloc(&draw);
+           continue;
+       }
 
 #if 0
        if(bbox.xMin > 0) {
-           font->glyph[t].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
+           font->glyph[font->numchars].advance = (bbox.xMax*20*FT_SCALE)/FT_SUBPIXELS;
        } else {
-           font->glyph[t].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
+           font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*20*FT_SCALE)/FT_SUBPIXELS;
        }
 #else
-       font->glyph[t].advance = glyph->advance.x/65536;
+       if(glyph)
+           font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
+       else
+           font->glyph[font->numchars].advance = 0;
 #endif
        
-       font->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
-       
-       font->layout->bounds[t].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
-       font->layout->bounds[t].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
-       font->layout->bounds[t].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
-       font->layout->bounds[t].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
+       SRECT b = swf_ShapeDrawerGetBBox(&draw);
+
+       //font->layout->bounds[font->numchars].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
+       //font->layout->bounds[font->numchars].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
+       //font->layout->bounds[font->numchars].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
+       //font->layout->bounds[font->numchars].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
+
+       font->layout->bounds[font->numchars] = b;
+       font->glyph[font->numchars].shape = swf_ShapeDrawerToShape(&draw);
+
+       swf_ExpandRect2(&fontbbox, &font->layout->bounds[font->numchars]);
 
        draw.dealloc(&draw);
 
-       FT_Done_Glyph(glyph);
+       if(glyph)
+           FT_Done_Glyph(glyph);
+       font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
+       glyph2glyph[t] = font->numchars;
+       font->numchars++;
     }
+    
+    //font->layout->ascent = abs(face->ascender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMin;
+    //font->layout->descent = abs(face->descender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMax;
+    //font->layout->leading = font->layout->ascent + font->layout->descent;
+
+    if(-fontbbox.ymin < 0)
+        font->layout->ascent = 0;
+    else
+       font->layout->ascent = -fontbbox.ymin;
+
+    if(fontbbox.ymax < 0)
+        font->layout->descent = 0;
+    else
+       font->layout->descent = fontbbox.ymax;
+
+    int leading = fontbbox.ymax - fontbbox.ymin;
+    font->layout->leading = leading>0x7fff?0x7fff:leading;
+
+    /* notice: if skip_unused is true, font->glyph2ascii, font->glyphnames and font->layout->bounds will 
+              have more memory allocated than just font->numchars, but only the first font->numchars 
+              are used/valid */
+
+    for(t=0;t<font->maxascii;t++) {
+       if(font->ascii2glyph[t]>=0) {
+           font->ascii2glyph[t] = glyph2glyph[font->ascii2glyph[t]];
+       }
+    }
+    rfx_free(glyph2glyph);
 
     FT_Done_Face(face);
     FT_Done_FreeType(ftlibrary);ftlibrary=0;
 
     return font;
 }
-#else  //USE_FREETYPE
+#else  //HAVE_FREETYPE
 
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename, char flashtype)
 {
     fprintf(stderr, "Warning: no freetype library- not able to load %s\n", filename);
     return 0;
@@ -260,7 +394,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 static int t1lib_initialized = 0;
 
-SWFFONT* swf_LoadT1Font(char*filename)
+static int counter = 0;
+
+SWFFONT* swf_LoadT1Font(const char*filename)
 {
     SWFFONT * font;
     int nr;
@@ -268,10 +404,11 @@ SWFFONT* swf_LoadT1Font(char*filename)
     char*fontname,*fullname,*familyname;
     BBox bbox;
     int s,num;
-    char*encoding[256];
     char**charnames;
     char**charname;
+    char*encoding[256];
     int c;
+    int t;
 
     if(!t1lib_initialized) {
        T1_SetBitmapPad(16);
@@ -284,10 +421,11 @@ SWFFONT* swf_LoadT1Font(char*filename)
     nr = T1_AddFont(filename);
     T1_LoadFont(nr);
 
-    num = T1_SetDefaultEncoding(encoding);
-    for(;num<256;num++) encoding[num] = 0;
-
     charnames = T1_GetAllCharNames(nr);
+    if(!charnames) {
+       fprintf(stderr, "No Charnames record- not a Type1 Font?\n");
+       return 0;
+    }
 
     angle = T1_GetItalicAngle(nr);
     fontname = T1_GetFontName(nr);
@@ -296,43 +434,47 @@ SWFFONT* swf_LoadT1Font(char*filename)
     underline = T1_GetUnderlinePosition(nr);
     bbox = T1_GetFontBBox(nr);
 
-    font = (SWFFONT*)malloc(sizeof(SWFFONT));
-    memset(font, 0, sizeof(SWFFONT));
+    font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
 
     font->version = 2;
-    font->name = (U8*)strdup(fontname);
-    font->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
-    memset(font->layout, 0, sizeof(SWFLAYOUT));
+    if(fontname) 
+       font->name = (U8*)strdup(fontname);
+    else 
+       font->name = 0;
+    font->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT));
 
     num = 0;
     charname = charnames;
     while(*charname) {
        charname++;
+       if(num<256) {
+           if(*charname) encoding[num] = strdup(*charname);
+           else          encoding[num] = strdup(".notdef");
+       }
        num++;
     }
+    for(t=num;t<256;t++)
+       encoding[t] = strdup(".notdef");
+    
+    //T1_ReencodeFont(nr, encoding);
 
     font->maxascii = num;
     font->numchars = num;
     
     font->style = (/*bold*/0?FONT_STYLE_BOLD:0) + (angle>0.05?FONT_STYLE_ITALIC:0);
 
-    font->glyph = (SWFGLYPH*)malloc(num*sizeof(SWFGLYPH));
-    memset(font->glyph, 0, num*sizeof(SWFGLYPH));
-    font->glyph2ascii = (U16*)malloc(num*sizeof(U16));
-    memset(font->glyph2ascii, 0, num*sizeof(U16));
-    font->ascii2glyph = (int*)malloc(font->maxascii*sizeof(int));
-    memset(font->ascii2glyph, -1, font->maxascii*sizeof(int));
+    font->glyph = (SWFGLYPH*)rfx_calloc(num*sizeof(SWFGLYPH));
+    font->glyph2ascii = (U16*)rfx_calloc(num*sizeof(U16));
+    font->ascii2glyph = (int*)rfx_calloc(font->maxascii*sizeof(int));
     font->layout->ascent = (U16)(underline - bbox.lly);
     font->layout->descent = (U16)(bbox.ury - underline);
     font->layout->leading = (U16)(font->layout->ascent - 
                             font->layout->descent -
                             (bbox.lly - bbox.ury));
-    font->layout->bounds = (SRECT*)malloc(sizeof(SRECT)*num);
-    memset(font->layout->bounds, 0, sizeof(SRECT)*num);
+    font->layout->bounds = (SRECT*)rfx_calloc(sizeof(SRECT)*num);
     font->layout->kerningcount = 0;
     font->layout->kerning = 0;
-    font->glyphnames = malloc(num*sizeof(char*));
-    memset(font->glyphnames, 0, num*sizeof(char*));
+    font->glyphnames = rfx_calloc(num*sizeof(char*));
   
     num = 0;
 
@@ -389,18 +531,22 @@ SWFFONT* swf_LoadT1Font(char*filename)
        draw.dealloc(&draw);
            
        font->layout->bounds[c] = bbox;
-       font->glyph[c].advance = bbox.xmax/20;
+       font->glyph[c].advance = bbox.xmax;
        if(!font->glyph[c].advance) {
            font->glyph[c].advance = firstx;
        }
        charname++;
     }
+    T1_DeleteFont(nr);
+
+    for(t=0;t<256;t++)
+       rfx_free(encoding[t]);
     return font;
 }
 
 #else
 
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
 {
     fprintf(stderr, "Warning: no t1lib- not able to load %s\n", filename);
     return 0;
@@ -408,13 +554,19 @@ SWFFONT* swf_LoadT1Font(char*filename)
 
 #endif
 
+SWFFONT* swf_DummyFont()
+{
+    SWFFONT*font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
+    return font;
+}
+
 static int isSWF(const char*filename)
 {
     FILE*fi = fopen(filename, "rb");
     char a[8];
     if(!fi) {
        perror(filename);
-       return 0;
+       return -1;
     }
     memset(a, 0, sizeof(a));
     fread(a, 4, 1, fi);
@@ -426,17 +578,27 @@ static int isSWF(const char*filename)
     return 0;
 }
 
-SWFFONT* swf_LoadFont(char*filename)
+SWFFONT* swf_LoadFont(const char*filename, char flashtype)
 {
-    if(isSWF(filename)) {
-       return swf_ReadFont(filename);
+    int is_swf;
+    if(filename == 0)
+       return swf_DummyFont();
+    is_swf = isSWF(filename);
+    if(is_swf<0)
+       return 0;
+    if(is_swf) {
+       SWFFONT*font = swf_ReadFont(filename);
+       if(flashtype && font->version==2)
+           fprintf(stderr, "Warning: Can't load font v2 file as flashtype (%s)\n", filename);
+       return font;
     }
-#if defined(USE_FREETYPE)
-    return swf_LoadTrueTypeFont(filename);
+
+#if defined(HAVE_FREETYPE)
+    return swf_LoadTrueTypeFont(filename, flashtype);
 #elif defined(HAVE_T1LIB)
     return swf_LoadT1Font(filename);
 #else
-    fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", infile);
+    fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", filename);
     return 0;
 #endif
 }