diff options
Diffstat (limited to 'src/base/ftobjs.c')
| -rw-r--r-- | src/base/ftobjs.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 19ff545d2..01b07bfc3 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -529,13 +529,17 @@ FT_UInt n; - base->outline.n_points = (short)( base->outline.n_points + current->outline.n_points ); - base->outline.n_contours = (short)( base->outline.n_contours + current->outline.n_contours ); - base->num_subglyphs += current->num_subglyphs; + base->outline.n_points = + (short)( base->outline.n_points + current->outline.n_points ); + base->outline.n_contours = + (short)( base->outline.n_contours + current->outline.n_contours ); + + base->num_subglyphs += current->num_subglyphs; /* adjust contours count in newest outline */ for ( n = 0; n < n_curr_contours; n++ ) - current->outline.contours[n] = (short)( current->outline.contours[n] + n_base_points ); + current->outline.contours[n] = + (short)( current->outline.contours[n] + n_base_points ); /* prepare for another new glyph image */ FT_GlyphLoader_Prepare( loader ); @@ -844,10 +848,11 @@ /* do we need to load the glyph through the auto-hinter? */ library = driver->root.library; hinter = library->auto_hinter; - autohint = FT_BOOL( hinter && + autohint = + FT_BOOL( hinter && !( load_flags & ( FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING ) ) && - FT_DRIVER_IS_SCALABLE(driver) && - FT_DRIVER_USES_OUTLINES(driver) ); + FT_DRIVER_IS_SCALABLE( driver ) && + FT_DRIVER_USES_OUTLINES( driver ) ); if ( autohint ) { if ( FT_DRIVER_HAS_HINTER( driver ) && @@ -1172,7 +1177,8 @@ *aface = 0; - external_stream = FT_BOOL(( args->flags & ft_open_stream ) && args->stream); + external_stream = FT_BOOL( ( args->flags & ft_open_stream ) && + args->stream ); /* create input stream */ error = ft_new_input_stream( library, args, &stream ); |