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

Fix previous commit. 

We want to unset FT_FACE_FLAG_SCALABLE only if there are bitmap
strikes in the font.

* src/truetype/ttobjs.c (tt_face_init): Implement it.

* docs/CHANGES: Updated.
This commit is contained in:
Werner Lemberg 2011-07-03 11:24:46 +02:00
parent b511999601
commit f4b63326f1
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2011-07-03 Werner Lemberg <wl@gnu.org>
Fix previous commit.
We want to unset FT_FACE_FLAG_SCALABLE only if there are bitmap
strikes in the font.
* src/truetype/ttobjs.c (tt_face_init): Implement it.
* docs/CHANGES: Updated.
2011-07-02 Just Fill Bugs <mozbugbox@yahoo.com.au>
Fix Savannah bug #33246.

6
docs/CHANGES
View File

@ -20,6 +20,12 @@ CHANGES BETWEEN 2.4.4 and 2.4.5
. Various stroking glitches has been fixed.
II. MISCELLANEOUS
- SFNT bitmap fonts which contain an outline glyph for `.notdef'
only no longer set the FT_FACE_FLAG_SCALABLE flag.
======================================================================
CHANGES BETWEEN 2.4.4 and 2.4.5

10
src/truetype/ttobjs.c
View File

@ -553,8 +553,10 @@
error = tt_face_load_prep( face, stream );
/* Check the scalable flag based on `loca'. */
if ( !ttface->internal->incremental_interface &&
face->glyph_locations && tt_check_single_notdef( ttface ) )
if ( !ttface->internal->incremental_interface &&
ttface->num_fixed_sizes &&
face->glyph_locations &&
tt_check_single_notdef( ttface ) )
{
FT_TRACE5(( "tt_face_init:"
" Only the `.notdef' glyph has an outline.\n"
@ -576,7 +578,9 @@
error = tt_face_load_prep( face, stream );
/* Check the scalable flag based on `loca'. */
if ( face->glyph_locations && tt_check_single_notdef( ttface ) )
if ( ttface->num_fixed_sizes &&
face->glyph_locations &&
tt_check_single_notdef( ttface ) )
{
FT_TRACE5(( "tt_face_init:"
" Only the `.notdef' glyph has an outline.\n"