From c9bdfa7e658f42f3faed2b426e3b1251a04938e4 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 6 Mar 2011 18:35:37 +0100 Subject: Fix autohinting fallback. * src/base/ftobjs.c (FT_Load_Glyph): Assure that we only check TTFs, ignoring CFF-based OTFs. --- ChangeLog | 7 +++++++ src/base/ftobjs.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index cb83ca87..a66d6494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-03-06 Werner Lemberg + + Fix autohinting fallback. + + * src/base/ftobjs.c (FT_Load_Glyph): Assure that we only check TTFs, + ignoring CFF-based OTFs. + 2011-02-27 Werner Lemberg Add AF_CONFIG_OPTION_USE_WARPER to control the autofit warper. diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 708055f9..219ece4c 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -627,9 +627,12 @@ FT_Render_Mode mode = FT_LOAD_TARGET_MODE( load_flags ); + /* the check for `num_locations' assures that we actually */ + /* test for instructions in a TTF and not in a CFF-based OTF */ if ( mode == FT_RENDER_MODE_LIGHT || face->internal->ignore_unpatented_hinter || ( FT_IS_SFNT( face ) && + ttface->num_locations && ttface->max_profile.maxSizeOfInstructions == 0 ) ) autohint = TRUE; } -- cgit v1.2.3