X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=4a7596b882b3f6771a233e8750bc847325755820;hb=46d9941a3140ef287a2cd0d4ed48d6d2c279aa5f;hp=d039ae43883f585c9342037b8897395e87517176;hpb=151e7df6db3719bed920fa13ac149080c75f9c8a;p=swftools.git diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c index d039ae4..4a7596b 100644 --- a/lib/modules/swffont.c +++ b/lib/modules/swffont.c @@ -21,10 +21,22 @@ 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 = 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 #include #include +#include #include #include #include @@ -94,8 +106,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) FT_UInt gindex; SWFFONT* font; int t; - int skipunused = 1; int*glyph2glyph; + FT_Size size; + int max_unicode = 0; if(ftlibrary == 0) { if(FT_Init_FreeType(&ftlibrary)) { @@ -104,12 +117,16 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) } } error = FT_New_Face(ftlibrary, filename, 0, &face); + FT_Set_Pixel_Sizes (face, 16*loadfont_scale, 16*loadfont_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)); @@ -131,9 +148,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) memset(font->glyphnames,0,face->num_glyphs*sizeof(char*)); } - 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->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; font->layout->kerningcount = 0; name = FT_Get_Postscript_Name(face); @@ -167,6 +184,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)); @@ -176,11 +196,13 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) 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; @@ -202,13 +224,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,9 +258,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; + } #if 0 if(bbox.xMin > 0) { @@ -258,7 +290,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) glyph2glyph[t] = font->numchars; 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 */ @@ -290,6 +322,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) static int t1lib_initialized = 0; +static int counter = 0; + SWFFONT* swf_LoadT1Font(char*filename) { SWFFONT * font; @@ -298,10 +332,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); @@ -314,10 +349,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); @@ -341,8 +377,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; @@ -413,7 +457,9 @@ SWFFONT* swf_LoadT1Font(char*filename) } last = pos; outline = outline->link; + printf("(%f,%f) ", pos.x, pos.y); } + printf("\n"); draw.finish(&draw); @@ -428,6 +474,10 @@ SWFFONT* swf_LoadT1Font(char*filename) } charname++; } + T1_DeleteFont(nr); + + for(t=0;t<256;t++) + free(encoding[t]); return font; } @@ -441,6 +491,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"); @@ -461,12 +518,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)