several bugfixes. Freetype fonts are now properly sized.

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

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 7ed72ed..fb837cc 100644 (file)
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,15 +21,25 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+static int loadfont_scale = 64;
+static int skip_unused = 1;
+
+void swf_SetLoadFontParameters(int _scale, int _skip_unused)
+{
+    loadfont_scale = _scale;
+    skip_unused = _skip_unused;
+}
+
 #ifdef HAVE_FREETYPE
 
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
 #include <freetype/ftsnames.h>
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
 
-#define FT_SCALE 1
+#define FT_SCALE loadfont_scale
 #define FT_SUBPIXELS 64
 
 static int ft_move_to(FT_Vector* _to, void* user) 
@@ -94,8 +104,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_UInt gindex;
     SWFFONT* font;
     int t;
-    int skipunused = 1;
     int*glyph2glyph;
+    FT_Size size;
    
     if(ftlibrary == 0) {
        if(FT_Init_FreeType(&ftlibrary)) {
@@ -104,12 +114,16 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        }
     }
     error = FT_New_Face(ftlibrary, filename, 0, &face);
+    FT_Set_Pixel_Sizes (face, 16, 16);
+
     if(error) {
        fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
        return 0;
     }
-    if(face->num_glyphs <= 0)
+    if(face->num_glyphs <= 0) {
+       fprintf(stderr, "File %s contains %d glyphs\n", face->num_glyphs);
        return 0;
+    }
 
     font = malloc(sizeof(SWFFONT));
     memset(font, 0, sizeof(SWFFONT));
@@ -133,7 +147,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
     font->layout->ascent = face->ascender*20/FT_SUBPIXELS; //face->bbox.xMin;
     font->layout->descent = abs(face->descender)*20/FT_SUBPIXELS; //face->bbox.xMax;
-    font->layout->leading = -face->bbox.xMin*20/FT_SUBPIXELS;
+    font->layout->leading = abs(face->bbox.yMin - face->bbox.yMax); //-face->bbox.xMin*20/FT_SUBPIXELS;
     font->layout->kerningcount = 0;
     
     name = FT_Get_Postscript_Name(face);
@@ -202,13 +216,19 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
                hasname = 1;
            }
        }
-       if(!font->glyph2ascii[t] && !hasname && skipunused) {
+       if(!font->glyph2ascii[t] && !hasname && skip_unused) {
+           continue;
+       }
+       error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP);
+       if(error) {
+           fprintf(stderr, "Couldn't load glyph %d, error:%d\n", t, error);
            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;
+       if(error) {
+           fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
+           continue;
+       }
 
        FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
        bbox.yMin = -bbox.yMin;
@@ -230,7 +250,13 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
        //error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
        error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
-       if(error) return 0;
+       draw.finish(&draw);
+       
+       if(error) {
+           fprintf(stderr, "Couldn't decompose glyph %d\n", t);
+           draw.dealloc(&draw);
+           continue;
+       }
 
        draw.finish(&draw);
 
@@ -256,17 +282,15 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        FT_Done_Glyph(glyph);
        font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
        glyph2glyph[t] = font->numchars;
-       printf("%d %d\n", t, glyph2glyph[t]);
        font->numchars++;
     }
-    /* notice: if skipunused is true, font->glyph2ascii, font->glyphnames and font->layout->bounds will 
+    /* 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]];
-           printf("ascii %d -> glyph %d\n", t, font->ascii2glyph[t]);
        }
     }
     free(glyph2glyph);
@@ -292,6 +316,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 static int t1lib_initialized = 0;
 
+static int counter = 0;
+
 SWFFONT* swf_LoadT1Font(char*filename)
 {
     SWFFONT * font;
@@ -300,10 +326,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);
@@ -316,10 +343,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);
@@ -343,8 +371,16 @@ SWFFONT* swf_LoadT1Font(char*filename)
     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;
@@ -415,7 +451,9 @@ SWFFONT* swf_LoadT1Font(char*filename)
            }
            last = pos;
            outline = outline->link;
+           printf("(%f,%f) ", pos.x, pos.y);
        }
+       printf("\n");
        
        draw.finish(&draw);
 
@@ -430,6 +468,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
        }
        charname++;
     }
+    T1_DeleteFont(nr);
+
+    for(t=0;t<256;t++)
+       free(encoding[t]);
     return font;
 }
 
@@ -443,6 +485,13 @@ SWFFONT* swf_LoadT1Font(char*filename)
 
 #endif
 
+SWFFONT* swf_DummyFont()
+{
+    SWFFONT*font = (SWFFONT*)malloc(sizeof(SWFFONT));
+    memset(font, 0, sizeof(SWFFONT));
+    return font;
+}
+
 static int isSWF(const char*filename)
 {
     FILE*fi = fopen(filename, "rb");
@@ -463,12 +512,16 @@ static int isSWF(const char*filename)
 
 SWFFONT* swf_LoadFont(char*filename)
 {
-    int is_swf = isSWF(filename);
+    int is_swf;
+    if(filename == 0)
+       return swf_DummyFont();
+    is_swf = isSWF(filename);
     if(is_swf<0)
        return 0;
     if(is_swf) {
        return swf_ReadFont(filename);
     }
+
 #if defined(HAVE_FREETYPE)
     return swf_LoadTrueTypeFont(filename);
 #elif defined(HAVE_T1LIB)