fixed space char detection bug

[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 d1673e5..cdebf67 100644 (file)
--- a/lib/filters/remove_font_transforms.c
+++ b/lib/filters/remove_font_transforms.c
@@ -145,7 +145,10 @@ static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m)
     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)
+       if(orig->glyphs[t].unicode==32 && 
+          (!orig->glyphs[t].line || 
+           !orig->glyphs[t].line->next || 
+           !orig->glyphs[t].line->next->next))
            f->used[t]=1; //always preserve the space char in fonts
     }
     return f;
@@ -265,7 +268,7 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
                if(char1>=0 && char2>=0) {
                    font->kerning[count].c1 = char1;
                    font->kerning[count].c2 = char2;
-                   font->kerning[count].advance = fd->orig->kerning[t].advance * fd->matrix.m00 * scale;
+                   font->kerning[count].advance = fd->orig->kerning[t].advance * fd->matrix.m00;
                    count++;
                }
            }