Commit fa9d39940ec25836f05206adbb4eb54f23899408
2008-10-08T16:04:46
Fix Savannah bug #24485. * src/type1/t1load.c (parse_charstrings): Assure that we always have a .notdef glyph.
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
diff --git a/ChangeLog b/ChangeLog
index 7ecc192..c01a93e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-22 John Tytgat <John.Tytgat@esko.com>
+
+ Fix Savannah bug #24485.
+
+ * src/type1/t1load.c (parse_charstrings): Assure that we always have
+ a .notdef glyph.
+
2008-10-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/ftmac.c: Include FT_TRUETYPE_TAGS_H for multi build.
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 36aa5de..284b7d7 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1626,15 +1626,11 @@
}
}
- if ( loader->num_glyphs )
- return;
- else
- loader->num_glyphs = n;
+ loader->num_glyphs = n;
/* if /.notdef is found but does not occupy index 0, do our magic. */
- if ( ft_strcmp( (const char*)".notdef",
- (const char*)name_table->elements[0] ) &&
- notdef_found )
+ if ( notdef_found &&
+ ft_strcmp( ".notdef", (const char*)name_table->elements[0] ) )
{
/* Swap glyph in index 0 with /.notdef glyph. First, add index 0 */
/* name and code entries to swap_table. Then place notdef_index */
@@ -1703,7 +1699,7 @@
/* and add our own /.notdef glyph to index 0. */
/* 0 333 hsbw endchar */
- FT_Byte notdef_glyph[] = {0x8B, 0xF7, 0xE1, 0x0D, 0x0E};
+ FT_Byte notdef_glyph[] = { 0x8B, 0xF7, 0xE1, 0x0D, 0x0E };
char* notdef_name = (char *)".notdef";
@@ -1741,7 +1737,7 @@
goto Fail;
/* we added a glyph. */
- loader->num_glyphs = n + 1;
+ loader->num_glyphs += 1;
}
return;