From ad6568afe9261fc37dfb1aa2360e67d5428f6221 Mon Sep 17 00:00:00 2001 From: David Turner Date: Sat, 22 Jun 2002 09:36:53 +0000 Subject: [PATCH] * src/pfr/pfrgload.c (pfr_glyph_load_compound): fixing a small composite glyph loader bug that caused accents to be misplaced in a number of glyphs.. --- ChangeLog | 12 +++++++++--- src/pfr/pfrgload.c | 11 ++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb8aad945..fea5db0f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,15 @@ +2002-06-22 Detlef Würkner + + * src/pfr/pfrgload.c (pfr_glyph_load_compound): fixing a small composite + glyph loader bug that caused accents to be misplaced in a number of + glyphs.. + 2002-06-21 Sven Neuman - * src/pfr/pfrobjs.h, src/pfr/pfrobjs.c, src/pfr/pfrload.c, - src/pfr/pfrtypes.h: adding Kerning support to the PFR driver + * src/pfr/pfrobjs.h, src/pfr/pfrobjs.c, src/pfr/pfrload.c, + src/pfr/pfrtypes.h: adding Kerning support to the PFR driver - * README, docs/CHANGES: preparing for the 2.1.2 release + * README, docs/CHANGES: preparing for the 2.1.2 release 2002-06-19 Detlef Würkner diff --git a/src/pfr/pfrgload.c b/src/pfr/pfrgload.c index a0c55d80f..d6b60862f 100644 --- a/src/pfr/pfrgload.c +++ b/src/pfr/pfrgload.c @@ -298,7 +298,7 @@ PFR_CHECK( 1 ); mask = PFR_NEXT_BYTE( p ); } - + if ( mask & 1 ) { PFR_CHECK( 2 ); @@ -309,7 +309,7 @@ PFR_CHECK( 1 ); x += PFR_NEXT_BYTE( p ); } - + glyph->x_control[i] = x; mask >>= 1; @@ -577,14 +577,15 @@ } subglyph = glyph->subs + org_count; - x_pos = 0; - y_pos = 0; for ( i = 0; i < count; i++, subglyph++ ) { FT_UInt format; + x_pos = 0; + y_pos = 0; + PFR_CHECK( 1 ); format = PFR_NEXT_BYTE( p ); @@ -635,7 +636,7 @@ default: ; } - + subglyph->x_delta = x_pos; subglyph->y_delta = y_pos;