From ae1dd1444d4a816156dd6233dfdb2e2d57a88e05 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Thu, 25 Mar 2010 18:24:38 -0700 Subject: [PATCH] fixed merge conflict --- lib/filters/remove_font_transforms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filters/remove_font_transforms.c b/lib/filters/remove_font_transforms.c index d1673e5..4b671f7 100644 --- a/lib/filters/remove_font_transforms.c +++ b/lib/filters/remove_font_transforms.c @@ -265,7 +265,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++; } } -- 1.7.10.4