[PATCH 1/2] tools/sfnt2fon: Just skip all glyphs below 0x20

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
ms_sans_serife.sfd includes a glyph for uni0009 and uni001B.
- Without the freetype 2.8.1 fix those do not make it to the generated
fon files.
- With the freetype 2.8.1 fix sfnt2fon adds glyphs uni0009 to uni0001F
to all generated fon files. The culprit is really sfnt2fon as the
freshly generated ms_sans_serife.ttf has only uni0009 and uni001B.

An alternative would be to remove uni0009 and uni001B from
ms_sans_serife.sfd but the 0xd glyph hack in sfnt2fon doesn't makes much
sense anyway as our other sfd fonts start with glyph 0x20.




 tools/sfnt2fon/sfnt2fon.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c
index ea915da..25f0763 100644
--- a/tools/sfnt2fon/sfnt2fon.c
+++ b/tools/sfnt2fon/sfnt2fon.c
@@ -439,9 +439,9 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
         el = 0;
 
     first_char = FT_Get_First_Char(face, &gi);
-    if(first_char == 0xd) /* fontforge's first glyph is 0xd, we'll catch this and skip it */
-        first_char = 32; /* FT_Get_Next_Char for some reason returns too high
-                            number in this case */
+    if(first_char < 0x20)  /* Ignore glyphs below 0x20 */
+        first_char = 0x20; /* FT_Get_Next_Char for some reason returns too high
+                              number in this case */
 
     info = calloc( 1, sizeof(*info) );
 
-- 
2.9.5