for(t=0;t<font->num_glyphs;t++) {
gfxglyph_t*g = &font->glyphs[t];
if(GLYPH_IS_SPACE(g)) {
- if(g->unicode == 32) return t;
- if(first_space<0)
- first_space = t;
+ if(g->unicode == 32) {
+ /* now that we have found a space char, make sure it's unique */
+ int s;
+ for(s=0;s<font->num_glyphs;s++) {
+ if(s!=t && font->glyphs[s].unicode==32)
+ font->glyphs[s].unicode=0;
+ }
+ return t;
+ }
}
}
- if(font->num_glyphs>32 && GLYPH_IS_SPACE(&font->glyphs[32])) {
- return 32;
- }
- return first_space;
+ return -1;
}
static int addSpace(gfxfont_t*font)
static gfxfont_t* createGfxFont(FontInfo*src)
{
- gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
- memset(font, 0, sizeof(gfxfont_t));
+ gfxfont_t*font = (gfxfont_t*)rfx_calloc(sizeof(gfxfont_t));
font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
gfxglyph_t*glyph = &font->glyphs[font->num_glyphs];
src->glyphs[t]->glyphid = font->num_glyphs;
glyph->unicode = src->glyphs[t]->unicode;
- if(glyph->unicode >= font->max_unicode)
- font->max_unicode = glyph->unicode+1;
gfxdrawer_t drawer;
gfxdrawer_target_gfxline(&drawer);
int s;