fix for zero font ids

[swftools.git] / lib / filters / remove_font_transforms.c

diff --git a/lib/filters/remove_font_transforms.c b/lib/filters/remove_font_transforms.c
index 84a873c..c94ee94 100644 (file)
--- a/lib/filters/remove_font_transforms.c
+++ b/lib/filters/remove_font_transforms.c
@@ -137,7 +137,7 @@ static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m)
     transformedfont_t*f = rfx_calloc(sizeof(transformedfont_t));
     f->orig = orig;
     f->matrix = *m;
     transformedfont_t*f = rfx_calloc(sizeof(transformedfont_t));
     f->orig = orig;
     f->matrix = *m;

-    f->used = malloc(sizeof(f->used[0])*orig->num_glyphs);
+    f->used = rfx_calloc(sizeof(f->used[0])*orig->num_glyphs);

     int t;
     for(t=0;t<orig->num_glyphs;t++) {
        if(orig->glyphs[t].unicode==32)
     int t;
     for(t=0;t<orig->num_glyphs;t++) {
        if(orig->glyphs[t].unicode==32)

@@ -150,7 +150,9 @@ static void pass1_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
 {
     internal_t*i = (internal_t*)f->internal;
     mymatrix_t m;
 {
     internal_t*i = (internal_t*)f->internal;
     mymatrix_t m;

-    matrix_convert(matrix, font->id, &m, 0);
+    if(!font->id) 
+       msg("<error> Font has no ID");
+    matrix_convert(matrix, font->id?font->id:"unknown", &m, 0);

     transformedfont_t*fd = dict_lookup(i->matrices, &m);
     if(!fd) {
        fd = transformedfont_new(font, &m);
     transformedfont_t*fd = dict_lookup(i->matrices, &m);
     if(!fd) {
        fd = transformedfont_new(font, &m);

@@ -217,7 +219,7 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
        fd->dx = -total.xmin;
 
        font->ascent = total.ymax;
        fd->dx = -total.xmin;
 
        font->ascent = total.ymax;

-       font->descent = total.ymin;
+       font->descent = -total.ymin;

 
        for(t=0;t<count;t++) {
            gfxline_t*line = font->glyphs[t].line;
 
        for(t=0;t<count;t++) {
            gfxline_t*line = font->glyphs[t].line;

@@ -251,7 +253,7 @@ static void pass2_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
 
     mymatrix_t m;
     gfxmatrix_t scalematrix;
 
     mymatrix_t m;
     gfxmatrix_t scalematrix;

-    matrix_convert(matrix, font->id, &m, &scalematrix);
+    matrix_convert(matrix, font->id?font->id:"unknown", &m, &scalematrix);

     transformedfont_t*d = dict_lookup(i->matrices, &m);
     scalematrix.tx -= d->dx*scalematrix.m00;
     out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);
     transformedfont_t*d = dict_lookup(i->matrices, &m);
     scalematrix.tx -= d->dx*scalematrix.m00;
     out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);