Commit 37b263e93aae60b73cde4c89059871a8adb64471
2002-06-22T09:36:53
* 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..
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/ChangeLog b/ChangeLog
index cb8aad9..fea5db0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+2002-06-22 Detlef Würkner <TetiSoft@apg.lahn.de>
+
+ * 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 <sven@convergence.de>
- * 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 <TetiSoft@apg.lahn.de>
diff --git a/src/pfr/pfrgload.c b/src/pfr/pfrgload.c
index a0c55d8..d6b6086 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;