From 82ad8ab242e2d26912251bd98503d9b779b6cb0f Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 26 Jun 2010 09:45:41 +0200 Subject: [PATCH] Fix last PFR change. * src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic. --- ChangeLog | 6 ++++++ src/pfr/pfrobjs.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc0252194..2d6403d86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-26 Werner Lemberg + + Fix last PFR change. + + * src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic. + 2010-06-26 Werner Lemberg Fix Savannah bug #30262. diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c index 307e6d3fe..40b1463ec 100644 --- a/src/pfr/pfrobjs.c +++ b/src/pfr/pfrobjs.c @@ -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; + } } }