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;
-// TODO: should be named "setLoadFontParameters"
void swf_SetLoadFontParameters(int _scale, int _skip_unused)
{
loadfont_scale = _scale;
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
#include <freetype/ftsnames.h>
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
SWFFONT* font;
int t;
int*glyph2glyph;
+ FT_Size size;
if(ftlibrary == 0) {
if(FT_Init_FreeType(&ftlibrary)) {
}
}
error = FT_New_Face(ftlibrary, filename, 0, &face);
+ FT_Set_Pixel_Sizes (face, 16, 16);
+
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));
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;
//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);
static int t1lib_initialized = 0;
+static int counter = 0;
+
SWFFONT* swf_LoadT1Font(char*filename)
{
SWFFONT * font;
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);
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);
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;
}
#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");
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)