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;
#ifdef HAVE_FREETYPE
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_SIZES_H
+#include FT_SFNT_NAMES_H
+#include FT_TRUETYPE_IDS_H
+#include FT_OUTLINE_H
+#else
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#include <freetype/ftsizes.h>
#include <freetype/ftsnames.h>
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
+#endif
-#define FT_SCALE loadfont_scale
+#define FT_SCALE 1
#define FT_SUBPIXELS 64
static int ft_move_to(FT_Vector* _to, void* user)
{
drawer_t* draw = (drawer_t*)user;
FPOINT to;
- to.x = _to->x/(float)FT_SUBPIXELS;
- to.y = -_to->y/(float)FT_SUBPIXELS;
+ to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
+ to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
draw->moveTo(draw, &to);
return 0;
}
{
drawer_t* draw = (drawer_t*)user;
FPOINT to;
- to.x = _to->x/(float)FT_SUBPIXELS;
- to.y = -_to->y/(float)FT_SUBPIXELS;
+ to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
+ to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
draw->lineTo(draw, &to);
return 0;
}
{
drawer_t* draw = (drawer_t*)user;
FPOINT c1,c2,to;
- 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;
+ 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);
return 0;
}
{
drawer_t* draw = (drawer_t*)user;
FPOINT c,to;
- 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;
+ 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);
return 0;
}
int*glyph2glyph;
FT_Size size;
int max_unicode = 0;
+ int charmap = -1;
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);
+ 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;
}
- font = malloc(sizeof(SWFFONT));
- memset(font, 0, sizeof(SWFFONT));
+ font = rfx_calloc(sizeof(SWFFONT));
font->id = -1;
font->version = 2;
- font->layout = malloc(sizeof(SWFLAYOUT));
- memset(font->layout, 0, sizeof(SWFLAYOUT));
- font->layout->bounds = malloc(face->num_glyphs*sizeof(SRECT));
+ font->layout = rfx_calloc(sizeof(SWFLAYOUT));
+ font->layout->bounds = 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 = malloc(face->num_glyphs*sizeof(U16));
- memset(font->glyph2ascii, 0, face->num_glyphs*sizeof(U16));
+ font->glyph2ascii = rfx_calloc(face->num_glyphs*sizeof(U16));
font->maxascii = 0;
- font->glyph = malloc(face->num_glyphs*sizeof(SWFGLYPH));
- memset(font->glyph, 0, face->num_glyphs*sizeof(SWFGLYPH));
+ font->glyph = rfx_calloc(face->num_glyphs*sizeof(SWFGLYPH));
if(FT_HAS_GLYPH_NAMES(face)) {
- font->glyphnames = malloc(face->num_glyphs*sizeof(char*));
- memset(font->glyphnames,0,face->num_glyphs*sizeof(char*));
+ font->glyphnames = rfx_calloc(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);
if(name && *name)
font->name = (U8*)strdup(name);
-/* // Map Glyphs to Unicode, version 1 (quick and dirty):
- int t;
- for(t=0;t<65536;t++) {
- int index = FT_Get_Char_Index(face, t);
- if(index>=0 && index<face->num_glyphs) {
- if(font->glyph2ascii[index]<0)
- font->glyph2ascii[index] = t;
- }
- }*/
-
- // Map Glyphs to Unicode, version 2 (much nicer):
- // (The third way would be the AGL algorithm, as proposed
- // by Werner Lemberg on freetype@freetype.org)
-
- charcode = FT_Get_First_Char(face, &gindex);
- while(gindex != 0)
+ while(1)
{
- if(gindex >= 0 && gindex<face->num_glyphs) {
- if(!font->glyph2ascii[gindex]) {
- font->glyph2ascii[gindex] = charcode;
- if(charcode + 1 > font->maxascii) {
- font->maxascii = charcode + 1;
+ /* // Map Glyphs to Unicode, version 1 (quick and dirty):
+ int t;
+ for(t=0;t<65536;t++) {
+ int index = FT_Get_Char_Index(face, t);
+ if(index>=0 && index<face->num_glyphs) {
+ if(font->glyph2ascii[index]<0)
+ font->glyph2ascii[index] = t;
+ }
+ }*/
+
+ // Map Glyphs to Unicode, version 2 (much nicer):
+ // (The third way would be the AGL algorithm, as proposed
+ // by Werner Lemberg on freetype@freetype.org)
+
+ charcode = FT_Get_First_Char(face, &gindex);
+ while(gindex != 0)
+ {
+ if(gindex >= 0 && gindex<face->num_glyphs) {
+ if(!font->glyph2ascii[gindex]) {
+ font->glyph2ascii[gindex] = charcode;
+ if(charcode + 1 > font->maxascii) {
+ font->maxascii = charcode + 1;
+ }
}
}
+ charcode = FT_Get_Next_Char(face, charcode, &gindex);
}
- charcode = FT_Get_Next_Char(face, charcode, &gindex);
+
+ /* if we didn't find a single encoding character, try
+ the font's charmaps instead. That usually means that
+ the encoding is no longer unicode.
+ TODO: find a way to convert the encoding to unicode
+ */
+ if(font->maxascii == 0 && charmap < face->num_charmaps - 1) {
+ charmap++;
+ FT_Set_Charmap(face, face->charmaps[charmap]);
+ font->encoding = 0;//anything but unicode FIXME
+ } else
+ break;
}
if(full_unicode)
font->maxascii = 65535;
- font->ascii2glyph = malloc(font->maxascii*sizeof(int));
+ font->ascii2glyph = rfx_calloc(font->maxascii*sizeof(int));
for(t=0;t<font->maxascii;t++) {
int g = FT_Get_Char_Index(face, t);
g = -1;
font->ascii2glyph[t] = g;
if(g>=0) {
- max_unicode = t;
+ max_unicode = t+1;
if(!font->glyph2ascii[g]) {
font->glyph2ascii[g] = t;
}
font->numchars = 0;
- glyph2glyph = (int*)malloc(face->num_glyphs*sizeof(int));
+ glyph2glyph = (int*)rfx_calloc(face->num_glyphs*sizeof(int));
for(t=0; t < face->num_glyphs; t++) {
FT_Glyph glyph;
continue;
}
- draw.finish(&draw);
-
#if 0
if(bbox.xMin > 0) {
font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
font->ascii2glyph[t] = glyph2glyph[font->ascii2glyph[t]];
}
}
- free(glyph2glyph);
+ rfx_free(glyph2glyph);
FT_Done_Face(face);
FT_Done_FreeType(ftlibrary);ftlibrary=0;
underline = T1_GetUnderlinePosition(nr);
bbox = T1_GetFontBBox(nr);
- font = (SWFFONT*)malloc(sizeof(SWFFONT));
- memset(font, 0, sizeof(SWFFONT));
+ font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
font->version = 2;
if(fontname)
font->name = (U8*)strdup(fontname);
else
font->name = 0;
- font->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
- memset(font->layout, 0, sizeof(SWFLAYOUT));
+ font->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT));
num = 0;
charname = charnames;
font->style = (/*bold*/0?FONT_STYLE_BOLD:0) + (angle>0.05?FONT_STYLE_ITALIC:0);
- font->glyph = (SWFGLYPH*)malloc(num*sizeof(SWFGLYPH));
- memset(font->glyph, 0, num*sizeof(SWFGLYPH));
- font->glyph2ascii = (U16*)malloc(num*sizeof(U16));
- memset(font->glyph2ascii, 0, num*sizeof(U16));
- font->ascii2glyph = (int*)malloc(font->maxascii*sizeof(int));
- memset(font->ascii2glyph, -1, font->maxascii*sizeof(int));
+ font->glyph = (SWFGLYPH*)rfx_calloc(num*sizeof(SWFGLYPH));
+ font->glyph2ascii = (U16*)rfx_calloc(num*sizeof(U16));
+ font->ascii2glyph = (int*)rfx_calloc(font->maxascii*sizeof(int));
font->layout->ascent = (U16)(underline - bbox.lly);
font->layout->descent = (U16)(bbox.ury - underline);
font->layout->leading = (U16)(font->layout->ascent -
font->layout->descent -
(bbox.lly - bbox.ury));
- font->layout->bounds = (SRECT*)malloc(sizeof(SRECT)*num);
- memset(font->layout->bounds, 0, sizeof(SRECT)*num);
+ font->layout->bounds = (SRECT*)rfx_calloc(sizeof(SRECT)*num);
font->layout->kerningcount = 0;
font->layout->kerning = 0;
- font->glyphnames = malloc(num*sizeof(char*));
- memset(font->glyphnames, 0, num*sizeof(char*));
+ font->glyphnames = rfx_calloc(num*sizeof(char*));
num = 0;
T1_DeleteFont(nr);
for(t=0;t<256;t++)
- free(encoding[t]);
+ rfx_free(encoding[t]);
return font;
}
SWFFONT* swf_DummyFont()
{
- SWFFONT*font = (SWFFONT*)malloc(sizeof(SWFFONT));
- memset(font, 0, sizeof(SWFFONT));
+ SWFFONT*font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
return font;
}
git.asbjorn.biz / swftools.git / blobdiff