fix bug in Mac_Read_POST_Resource()
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
diff --git a/ChangeLog b/ChangeLog
index 67ea176..1ba3ac9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ Fix bug in Mac_Read_POST_Resource() to parse PFB font with MacOS
+ resource fork (bug since 2003-09-11). Patch is provided by
+ Huib-Jan Imbens <ft@imbens.nl>.
+
+ * src/base/ftobjs.c: fix pfb_pos initialization, remove extra cast
+ to copy to pfb_lenpos.
+
2006-04-29 Werner Lemberg <wl@gnu.org>
Further C library abstraction. Based on a patch from
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index ccd0ed5..a7d82de 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1255,7 +1255,7 @@
pfb_data[3] = 0;
pfb_data[4] = 0;
pfb_data[5] = 0;
- pfb_pos = 7;
+ pfb_pos = 6;
pfb_lenpos = 2;
len = 0;
@@ -1288,7 +1288,7 @@
len = rlen;
pfb_data[pfb_pos++] = (FT_Byte)type;
- pfb_lenpos = (FT_Byte)pfb_pos;
+ pfb_lenpos = pfb_pos;
pfb_data[pfb_pos++] = 0; /* 4-byte length, fill in later */
pfb_data[pfb_pos++] = 0;
pfb_data[pfb_pos++] = 0;