OSX bearing fix

[swftools.git] / lib / gfxfont.c

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index c1b82eb..fa75059 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;
            }
        }
@@ -592,7 +593,7 @@ void gfxfont_fix_unicode(gfxfont_t*font)
     }
 }
 
-ttf_t* gfxfont_to_ttf(gfxfont_t*font)
+ttf_t* gfxfont_to_ttf(gfxfont_t*font, char eot)
 {
     ttf_t*ttf = ttf_new();
     int num_glyphs = font->num_glyphs;
@@ -664,6 +665,26 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
            }
        }
 
+       if(eot) {
+           dest->bearing = dest->xmin;
+           /* for windows font rendering, make sure coordinates are always 
+              to the right of the origin (and use bearing to shift them "back".)
+              Don't do this for non-windows platforms though because e.g. OS X 
+              ignores bearing. */
+           int xshift=0;
+           if(dest->xmin < 0) {
+               xshift = -dest->xmin;
+               for(s=0;s<count;s++) {
+                   dest->points[s].x += xshift;
+               }
+               dest->xmin += xshift;
+               dest->xmax += xshift;
+           }
+       }
+       dest->advance = src->advance*scale;
+
+       //dest->xmin=0; //TODO: might be necessary for some font engines?
+
        dest->advance = src->advance*scale;
 
        int u = font->glyphs[t].unicode;
@@ -691,7 +712,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);
@@ -720,14 +741,14 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
 
 void gfxfont_save(gfxfont_t*font, const char*filename)
 {
-    ttf_t*ttf = gfxfont_to_ttf(font);
+    ttf_t*ttf = gfxfont_to_ttf(font, 0);
     ttf_save(ttf, filename);
     ttf_destroy(ttf);
 }
 
 void gfxfont_save_eot(gfxfont_t*font, const char*filename)
 {
-    ttf_t*ttf = gfxfont_to_ttf(font);
+    ttf_t*ttf = gfxfont_to_ttf(font, 1);
     ttf_save_eot(ttf, filename);
     ttf_destroy(ttf);
 }