along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#include <stdio.h>
+#include <stdlib.h>
+#include "../rfxswf.h"
+
static int loadfont_scale = 4;
static int skip_unused = 1;
static int full_unicode = 0;
#include <freetype/ftoutln.h>
#endif
+/* Setting subpixels to 64 also means that the "point size" of the
+ font outlines will be 64. So the font, when rendered at original
+ size (i.e., the swf fontsize is 1024) will have the same size as
+ if it was rendered at 64pt */
+
#define FT_SCALE 1
#define FT_SUBPIXELS 64
-static int ft_move_to(FT_Vector* _to, void* user)
+static int ft_move_to(const FT_Vector* _to, void* user)
{
drawer_t* draw = (drawer_t*)user;
FPOINT to;
draw->moveTo(draw, &to);
return 0;
}
-static int ft_line_to(FT_Vector* _to, void* user)
+static int ft_line_to(const FT_Vector* _to, void* user)
{
drawer_t* draw = (drawer_t*)user;
FPOINT to;
draw->lineTo(draw, &to);
return 0;
}
-static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* user)
+static int ft_conic_to(const FT_Vector* _c, const FT_Vector* _to, void* user)
{
drawer_t* draw = (drawer_t*)user;
- FPOINT c1,c2,to;
+ FPOINT c,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;
- draw_cubicTo(draw, &c1, &c2, &to);
+ c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
+ c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
+ draw_conicTo(draw, &c, &to);
return 0;
}
-static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user)
+static int ft_cubic_to(const FT_Vector* _c1, const FT_Vector* _c2, const FT_Vector* _to, void* user)
{
drawer_t* draw = (drawer_t*)user;
- FPOINT c,to;
+ FPOINT c1,c2,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;
- draw_conicTo(draw, &c, &to);
+ 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;
+ draw_cubicTo(draw, &c1, &c2, &to);
return 0;
}
static FT_Outline_Funcs outline_functions =
static FT_Library ftlibrary = 0;
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename, char flashtype)
{
FT_Face face;
FT_Error error;
SWFFONT* font;
int t;
int*glyph2glyph;
- FT_Size size;
int max_unicode = 0;
int charmap = -1;
-
+
if(ftlibrary == 0) {
if(FT_Init_FreeType(&ftlibrary)) {
fprintf(stderr, "Couldn't init freetype library!\n");
}
}
error = FT_New_Face(ftlibrary, filename, 0, &face);
- FT_Set_Pixel_Sizes (face, 16*loadfont_scale, 16*loadfont_scale);
- if(error) {
+ if(error || !face) {
fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
return 0;
}
+
+ int scale = flashtype?20:1;
+ FT_Set_Pixel_Sizes (face, 16*loadfont_scale*scale, 16*loadfont_scale*scale);
+
if(face->num_glyphs <= 0) {
- fprintf(stderr, "File %s contains %d glyphs\n", face->num_glyphs);
+ fprintf(stderr, "File %s contains %d glyphs\n", filename, (int)face->num_glyphs);
return 0;
}
- font = rfx_calloc(sizeof(SWFFONT));
+ font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
font->id = -1;
- font->version = 2;
- font->layout = rfx_calloc(sizeof(SWFLAYOUT));
- font->layout->bounds = rfx_calloc(face->num_glyphs*sizeof(SRECT));
+ font->version = flashtype?3:2;
+
+ font->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT));
+ font->layout->bounds = (SRECT*)rfx_calloc(face->num_glyphs*sizeof(SRECT));
font->style = ((face->style_flags&FT_STYLE_FLAG_ITALIC)?FONT_STYLE_ITALIC:0)
|((face->style_flags&FT_STYLE_FLAG_BOLD)?FONT_STYLE_BOLD:0);
font->encoding = FONT_ENCODING_UNICODE;
- font->glyph2ascii = rfx_calloc(face->num_glyphs*sizeof(U16));
+ font->glyph2ascii = (U16*)rfx_calloc(face->num_glyphs*sizeof(U16));
font->maxascii = 0;
- font->glyph = rfx_calloc(face->num_glyphs*sizeof(SWFGLYPH));
+ font->glyph = (SWFGLYPH*)rfx_calloc(face->num_glyphs*sizeof(SWFGLYPH));
if(FT_HAS_GLYPH_NAMES(face)) {
- font->glyphnames = rfx_calloc(face->num_glyphs*sizeof(char*));
+ font->glyphnames = (char**)rfx_calloc(face->num_glyphs*sizeof(char*));
}
-
- 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);
+ name = face->family_name;
+ if(!(name && *name))
+ name = FT_Get_Postscript_Name(face);
if(name && *name)
font->name = (U8*)strdup(name);
if(full_unicode)
font->maxascii = 65535;
- font->ascii2glyph = rfx_calloc(font->maxascii*sizeof(int));
+ font->ascii2glyph = (int*)rfx_calloc(font->maxascii*sizeof(int));
for(t=0;t<font->maxascii;t++) {
int g = FT_Get_Char_Index(face, t);
glyph2glyph = (int*)rfx_calloc(face->num_glyphs*sizeof(int));
+ SRECT fontbbox = {0,0,0,0};
+
for(t=0; t < face->num_glyphs; t++) {
FT_Glyph glyph;
FT_BBox bbox;
- FT_Matrix matrix;
char name[128];
drawer_t draw;
- int ret;
char hasname = 0;
name[0]=0;
if(FT_HAS_GLYPH_NAMES(face)) {
}
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) {
- fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
- continue;
+ //tends to happen with some pdfs
+ fprintf(stderr, "Warning: Glyph %d has return code %d\n", t, error);
+ glyph=0;
+ if(skip_unused)
+ continue;
+ } else {
+ error = FT_Get_Glyph(face->glyph, &glyph);
+ if(error) {
+ fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
+ glyph=0;
+ if(skip_unused)
+ continue;
+ }
}
- FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+ if(glyph)
+ FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+ else
+ memset(&bbox, 0, sizeof(bbox));
+
bbox.yMin = -bbox.yMin;
bbox.yMax = -bbox.yMax;
if(bbox.xMax < bbox.xMin) {
swf_Shape01DrawerInit(&draw, 0);
//error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
- error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
+ if(glyph)
+ error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
+ else
+ error = 0;
draw.finish(&draw);
if(error) {
#if 0
if(bbox.xMin > 0) {
- font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
+ font->glyph[font->numchars].advance = (bbox.xMax*20*FT_SCALE)/FT_SUBPIXELS;
} else {
- font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
+ font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*20*FT_SCALE)/FT_SUBPIXELS;
}
#else
- font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
+ if(glyph)
+ font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
+ else
+ font->glyph[font->numchars].advance = 0;
#endif
+ SRECT b = swf_ShapeDrawerGetBBox(&draw);
+
+ //font->layout->bounds[font->numchars].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
+ //font->layout->bounds[font->numchars].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
+ //font->layout->bounds[font->numchars].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
+ //font->layout->bounds[font->numchars].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
+
+ font->layout->bounds[font->numchars] = b;
font->glyph[font->numchars].shape = swf_ShapeDrawerToShape(&draw);
-
- font->layout->bounds[font->numchars].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
- font->layout->bounds[font->numchars].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
- font->layout->bounds[font->numchars].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
- font->layout->bounds[font->numchars].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
+
+ swf_ExpandRect2(&fontbbox, &font->layout->bounds[font->numchars]);
draw.dealloc(&draw);
- FT_Done_Glyph(glyph);
+ if(glyph)
+ FT_Done_Glyph(glyph);
font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
glyph2glyph[t] = font->numchars;
font->numchars++;
}
+
+ //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;
+
+ if(-fontbbox.ymin < 0)
+ font->layout->ascent = 0;
+ else
+ font->layout->ascent = -fontbbox.ymin;
+
+ if(fontbbox.ymax < 0)
+ font->layout->descent = 0;
+ else
+ font->layout->descent = fontbbox.ymax;
+
+ int leading = fontbbox.ymax - fontbbox.ymin;
+ font->layout->leading = leading>0x7fff?0x7fff:leading;
+
/* 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 */
}
#else //HAVE_FREETYPE
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename, char flashtype)
{
fprintf(stderr, "Warning: no freetype library- not able to load %s\n", filename);
return 0;
static int counter = 0;
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
{
SWFFONT * font;
int nr;
}
last = pos;
outline = outline->link;
- printf("(%f,%f) ", pos.x, pos.y);
}
- printf("\n");
draw.finish(&draw);
#else
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
{
fprintf(stderr, "Warning: no t1lib- not able to load %s\n", filename);
return 0;
return 0;
}
-SWFFONT* swf_LoadFont(char*filename)
+SWFFONT* swf_LoadFont(const char*filename, char flashtype)
{
int is_swf;
if(filename == 0)
if(is_swf<0)
return 0;
if(is_swf) {
- return swf_ReadFont(filename);
+ SWFFONT*font = swf_ReadFont(filename);
+ if(flashtype && font->version==2)
+ fprintf(stderr, "Warning: Can't load font v2 file as flashtype (%s)\n", filename);
+ return font;
}
#if defined(HAVE_FREETYPE)
- return swf_LoadTrueTypeFont(filename);
+ return swf_LoadTrueTypeFont(filename, flashtype);
#elif defined(HAVE_T1LIB)
return swf_LoadT1Font(filename);
#else
git.asbjorn.biz / swftools.git / blobdiff