minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

Fix Savannah bug #24485. 

* src/type1/t1load.c (parse_charstrings): Assure that we always have
a .notdef glyph.
This commit is contained in:
Werner Lemberg 2008-10-08 16:04:46 +00:00
parent 54dd7cf43b
commit fa9d39940e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

14
src/type1/t1load.c
View File

@ -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;