added reencoding code.

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

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index c957878..4d14534 100644 (file)
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -117,8 +117,10 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        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));
@@ -215,9 +217,15 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
            continue;
        }
        error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
-       if(error) return 0;
+       if(error) {
+           fprintf(stderr, "Couldn't load glyph %d\n", t);
+           continue;
+       }
        error = FT_Get_Glyph(face->glyph, &glyph);
-       if(error) return 0;
+       if(error) {
+           fprintf(stderr, "Couldn't get glyph %d\n", t);
+           continue;
+       }
 
        FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
        bbox.yMin = -bbox.yMin;
@@ -239,7 +247,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);
 
@@ -299,6 +313,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 static int t1lib_initialized = 0;
 
+static int counter = 0;
+
 SWFFONT* swf_LoadT1Font(char*filename)
 {
     SWFFONT * font;
@@ -307,10 +323,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);
@@ -323,10 +340,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);
@@ -350,8 +368,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;
@@ -401,6 +427,7 @@ SWFFONT* swf_LoadT1Font(char*filename)
        
        swf_Shape01DrawerInit(&draw, 0);
 
+       printf("Char %d (%08x)", c, outline);
        while(outline) {
            pos.x += (outline->dest.x/(float)0xffff);
            pos.y += (outline->dest.y/(float)0xffff);
@@ -422,7 +449,9 @@ SWFFONT* swf_LoadT1Font(char*filename)
            }
            last = pos;
            outline = outline->link;
+           printf("(%f,%f) ", pos.x, pos.y);
        }
+       printf("\n");
        
        draw.finish(&draw);
 
@@ -437,6 +466,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
        }
        charname++;
     }
+    T1_DeleteFont(nr);
+
+    for(t=0;t<256;t++)
+       free(encoding[t]);
     return font;
 }
 
@@ -450,6 +483,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");
@@ -470,12 +510,19 @@ 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);
     }
+
+
+    return swf_LoadT1Font(filename);
+
 #if defined(HAVE_FREETYPE)
     return swf_LoadTrueTypeFont(filename);
 #elif defined(HAVE_T1LIB)