X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=8016df4e125721d704cb0752298ab8f19a59416a;hb=7169758cfe50bc9fa3bbbf75a1859d9a6fb58776;hp=c957878da46c790c7243e0869a5ccf1a7b1e3f5a;hpb=aecc804e3bd0642924c2225b76f483c6f32491c7;p=swftools.git diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c index c957878..8016df4 100644 --- a/lib/modules/swffont.c +++ b/lib/modules/swffont.c @@ -21,13 +21,13 @@ 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 = 1; +static int loadfont_scale = 64; static int skip_unused = 1; +static int full_unicode = 0; -// TODO: should be named "setLoadFontParameters" -void swf_SetLoadFontParameters(int _scale, int _skip_unused) +void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode) { - loadfont_scale = _scale; + if(_scale) loadfont_scale = _scale; skip_unused = _skip_unused; } @@ -35,6 +35,7 @@ void swf_SetLoadFontParameters(int _scale, int _skip_unused) #include #include +#include #include #include #include @@ -46,8 +47,8 @@ static int ft_move_to(FT_Vector* _to, void* user) { drawer_t* draw = (drawer_t*)user; FPOINT to; - to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS; - to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS; + to.x = _to->x/(float)FT_SUBPIXELS; + to.y = -_to->y/(float)FT_SUBPIXELS; draw->moveTo(draw, &to); return 0; } @@ -55,8 +56,8 @@ static int ft_line_to(FT_Vector* _to, void* user) { drawer_t* draw = (drawer_t*)user; FPOINT to; - to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS; - to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS; + to.x = _to->x/(float)FT_SUBPIXELS; + to.y = -_to->y/(float)FT_SUBPIXELS; draw->lineTo(draw, &to); return 0; } @@ -64,12 +65,12 @@ static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* use { drawer_t* draw = (drawer_t*)user; FPOINT c1,c2,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; + to.x = _to->x/(float)FT_SUBPIXELS; + to.y = -_to->y/(float)FT_SUBPIXELS; + c1.x = _c1->x/(float)FT_SUBPIXELS; + c1.y = -_c1->y/(float)FT_SUBPIXELS; + c2.x = _c2->x/(float)FT_SUBPIXELS; + c2.y = -_c2->y/(float)FT_SUBPIXELS; draw_cubicTo(draw, &c1, &c2, &to); return 0; } @@ -77,10 +78,10 @@ static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user) { drawer_t* draw = (drawer_t*)user; FPOINT c,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; + to.x = _to->x/(float)FT_SUBPIXELS; + to.y = -_to->y/(float)FT_SUBPIXELS; + c.x = _c->x/(float)FT_SUBPIXELS; + c.y = -_c->y/(float)FT_SUBPIXELS; draw_conicTo(draw, &c, &to); return 0; } @@ -105,6 +106,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) SWFFONT* font; int t; int*glyph2glyph; + FT_Size size; + int max_unicode = 0; if(ftlibrary == 0) { if(FT_Init_FreeType(&ftlibrary)) { @@ -113,12 +116,16 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) } } error = FT_New_Face(ftlibrary, filename, 0, &face); + FT_Set_Pixel_Sizes (face, 16*FT_SCALE, 16*FT_SCALE); + 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)); @@ -176,6 +183,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) } charcode = FT_Get_Next_Char(face, charcode, &gindex); } + + if(full_unicode) + font->maxascii = 65535; font->ascii2glyph = malloc(font->maxascii*sizeof(int)); @@ -185,11 +195,13 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) g = -1; font->ascii2glyph[t] = g; if(g>=0) { + max_unicode = t; if(!font->glyph2ascii[g]) { font->glyph2ascii[g] = t; } } } + font->maxascii = max_unicode; font->numchars = 0; @@ -214,10 +226,16 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) if(!font->glyph2ascii[t] && !hasname && skip_unused) { continue; } - error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE); - if(error) return 0; + 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_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; @@ -239,7 +257,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 +323,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) static int t1lib_initialized = 0; +static int counter = 0; + SWFFONT* swf_LoadT1Font(char*filename) { SWFFONT * font; @@ -307,10 +333,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 +350,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 +378,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; @@ -422,7 +458,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 +475,10 @@ SWFFONT* swf_LoadT1Font(char*filename) } charname++; } + T1_DeleteFont(nr); + + for(t=0;t<256;t++) + free(encoding[t]); return font; } @@ -450,6 +492,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 +519,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)