From 7a753c9653d91dbf57d96935811e164a963b0669 Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Tue, 18 Jun 2024 21:14:58 -0400 Subject: [PATCH] * src/base/ftgloadr.c (FT_GlyphLoader_Prepare): Minor refactoring. --- src/base/ftgloadr.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 4d94c3d5d..484d98f17 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -355,24 +355,25 @@ FT_BASE_DEF( void ) FT_GlyphLoader_Add( FT_GlyphLoader loader ) { - FT_GlyphLoad base; - FT_GlyphLoad current; - FT_Int n; + FT_Outline* base; + FT_Outline* current; + FT_Int n; if ( !loader ) return; - base = &loader->base; - current = &loader->current; + base = &loader->base.outline; + current = &loader->current.outline; /* adjust contours count in newest outline */ - for ( n = 0; n < current->outline.n_contours; n++ ) - current->outline.contours[n] += base->outline.n_points; + for ( n = 0; n < current->n_contours; n++ ) + current->contours[n] += base->n_points; - base->outline.n_points += current->outline.n_points; - base->outline.n_contours += current->outline.n_contours; - base->num_subglyphs += current->num_subglyphs; + base->n_points += current->n_points; + base->n_contours += current->n_contours; + + loader->base.num_subglyphs += loader->current.num_subglyphs; /* prepare for another new glyph image */ FT_GlyphLoader_Prepare( loader );