X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=4a7596b882b3f6771a233e8750bc847325755820;hb=46d9941a3140ef287a2cd0d4ed48d6d2c279aa5f;hp=49c5677b6d450da8de522c020d6a56dc217a4992;hpb=e9631a8e0e3870d2d758ba9c584210f64a202419;p=swftools.git diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c index 49c5677..4a7596b 100644 --- a/lib/modules/swffont.c +++ b/lib/modules/swffont.c @@ -21,25 +21,27 @@ 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 = 4; 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; + full_unicode = _full_unicode; } #ifdef HAVE_FREETYPE #include #include +#include #include #include #include -#define FT_SCALE loadfont_scale +#define FT_SCALE 1 #define FT_SUBPIXELS 64 static int ft_move_to(FT_Vector* _to, void* user) @@ -105,6 +107,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 +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)); @@ -140,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 = abs(face->bbox.yMin - face->bbox.yMax); //-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); @@ -176,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)); @@ -185,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; @@ -214,10 +227,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,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) { @@ -309,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); @@ -325,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); @@ -352,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; @@ -424,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); @@ -439,6 +474,10 @@ SWFFONT* swf_LoadT1Font(char*filename) } charname++; } + T1_DeleteFont(nr); + + for(t=0;t<256;t++) + free(encoding[t]); return font; } @@ -488,6 +527,7 @@ SWFFONT* swf_LoadFont(char*filename) if(is_swf) { return swf_ReadFont(filename); } + #if defined(HAVE_FREETYPE) return swf_LoadTrueTypeFont(filename); #elif defined(HAVE_T1LIB)