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;
+ full_unicode = _full_unicode;
}
#ifdef HAVE_FREETYPE
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
#include <freetype/ftsnames.h>
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
{
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;
}
{
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;
}
{
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;
}
{
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;
}
SWFFONT* font;
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*FT_SCALE, 16*FT_SCALE);
+
if(error) {
fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
return 0;
}
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;
if(!font->glyph2ascii[g]) {
font->glyph2ascii[g] = t;
}
}
}
+ font->maxascii = max_unicode;
font->numchars = 0;
if(!font->glyph2ascii[t] && !hasname && skip_unused) {
continue;
}
- error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
+ error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP);
if(error) {
- fprintf(stderr, "Couldn't load glyph %d\n", t);
+ fprintf(stderr, "Couldn't load glyph %d, error:%d\n", t, error);
continue;
}
error = FT_Get_Glyph(face->glyph, &glyph);
if(error) {
- fprintf(stderr, "Couldn't get glyph %d\n", t);
+ fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
continue;
}
int s,num;
char**charnames;
char**charname;
+ char*encoding[256];
int c;
+ int t;
if(!t1lib_initialized) {
T1_SetBitmapPad(16);
T1_LoadFont(nr);
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);
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;
}
last = pos;
outline = outline->link;
+ printf("(%f,%f) ", pos.x, pos.y);
}
+ printf("\n");
draw.finish(&draw);
}
charname++;
}
+ T1_DeleteFont(nr);
+
+ for(t=0;t<256;t++)
+ free(encoding[t]);
return font;
}
if(is_swf) {
return swf_ReadFont(filename);
}
+
#if defined(HAVE_FREETYPE)
return swf_LoadTrueTypeFont(filename);
#elif defined(HAVE_T1LIB)