X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=4d145344fd875a80eee32f8b4596533c13f79c54;hb=295dd98fad95646311da550526a4156a61929970;hp=ba734092031a66b52ff5ea1391a2c102f84971df;hpb=15c3c47514b04bfd2f9222ebbdbd972f8b916cb8;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index ba73409..4d14534 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -323,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);
@@ -339,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);
@@ -366,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;
@@ -417,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);
@@ -438,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);
 
@@ -453,6 +466,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	}
 	charname++;
     }
+    T1_DeleteFont(nr);
+
+    for(t=0;t<256;t++)
+	free(encoding[t]);
     return font;
 }
 
@@ -502,6 +519,10 @@ SWFFONT* swf_LoadFont(char*filename)
     if(is_swf) {
 	return swf_ReadFont(filename);
     }
+
+
+    return swf_LoadT1Font(filename);
+
 #if defined(HAVE_FREETYPE)
     return swf_LoadTrueTypeFont(filename);
 #elif defined(HAVE_T1LIB)