more fiddling with edgestyles

[swftools.git] / lib / gfxfont.c

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index c1b82eb..acc8e34 100644 (file)
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -570,6 +570,7 @@ void gfxfont_fix_unicode(gfxfont_t*font)
            int u = font->glyphs[t].unicode;
            if(u>=0) {
                assert(font->unicode2glyph[u]<0); // we took care of duplicates, right?
+               assert(u<font->max_unicode);
                font->unicode2glyph[u] = t;
            }
        }
@@ -664,6 +665,7 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
            }
        }
 
+       dest->bearing = dest->xmin;
        dest->advance = src->advance*scale;
 
        int u = font->glyphs[t].unicode;
@@ -691,7 +693,7 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
        }
     } else {
        int u;
-       for(u=1;u<ttf->unicode_size;u++) {
+       for(u=1;u<font->max_unicode;u++) {
            int g = font->unicode2glyph[u];
            if(g>=0 && u<32) {
                msg("<warning> gfxfont_to_ttf: Font contains an invalid unicode (%d)", u);