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 = 64;
+static int loadfont_scale = 4;
static int skip_unused = 1;
+static int full_unicode = 0;
-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 <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
-#define FT_SCALE loadfont_scale
+#define FT_SCALE 1
#define FT_SUBPIXELS 64
static int ft_move_to(FT_Vector* _to, void* user)
int t;
int*glyph2glyph;
FT_Size size;
+ int max_unicode = 0;
if(ftlibrary == 0) {
if(FT_Init_FreeType(&ftlibrary)) {
}
}
error = FT_New_Face(ftlibrary, filename, 0, &face);
- FT_Set_Pixel_Sizes (face, 16, 16);
+ 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);
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);
}
charcode = FT_Get_Next_Char(face, charcode, &gindex);
}
+
+ if(full_unicode)
+ font->maxascii = 65535;
font->ascii2glyph = malloc(font->maxascii*sizeof(int));
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;
continue;
}
- draw.finish(&draw);
-
#if 0
if(bbox.xMin > 0) {
font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;