shithub: freetype+ttf2subf

Download patch

ref: 82ad8ab242e2d26912251bd98503d9b779b6cb0f
parent: 7d911736439e31fe71c816286e7a764612bf520d
author: Werner Lemberg <[email protected]>
date: Sat Jun 26 05:45:41 EDT 2010 

Fix last PFR change.

* src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-26  Werner Lemberg  <[email protected]>
 
+	Fix last PFR change.
+
+	* src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic.
+
+2010-06-26  Werner Lemberg  <[email protected]>
+
 	Fix Savannah bug #30262.
 
 	* src/sfnt/ttload.c (tt_face_load_maxp): Limit `maxComponentDepth'
--- 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;
+          }
         }
       }