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

Fix last PFR change. 

* src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic.
This commit is contained in:
Werner Lemberg 2010-06-26 09:45:41 +02:00
parent 7d91173643
commit 82ad8ab242
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-26 Werner Lemberg <wl@gnu.org>
Fix last PFR change.
* src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic.
2010-06-26 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #30262.

16
src/pfr/pfrobjs.c
View File

@ -146,16 +146,16 @@
if ( phy_font->chars[nn].gps_offset != 0 )
break;
if ( phy_font->num_strikes > 0 )
if ( nn == phy_font->num_chars )
{
if ( nn == phy_font->num_chars )
if ( phy_font->num_strikes > 0 )
pfrface->face_flags = 0; /* not scalable */
}
else
{
FT_ERROR(( "pfr_face_init: font doesn't contain glyphs\n" ));
error = PFR_Err_Invalid_File_Format;
goto Exit;
else
{
FT_ERROR(( "pfr_face_init: font doesn't contain glyphs\n" ));
error = PFR_Err_Invalid_File_Format;
goto Exit;
}
}
}