summaryrefslogtreecommitdiff
path: root/src/base/ftgloadr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/base/ftgloadr.c')
-rw-r--r--src/base/ftgloadr.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c
index 94a070673..980609af6 100644
--- a/src/base/ftgloadr.c
+++ b/src/base/ftgloadr.c
@@ -4,7 +4,7 @@
/* */
/* The FreeType glyph loader (body). */
/* */
-/* Copyright 2002, 2003, 2004 by */
+/* Copyright 2002, 2003, 2004, 2005 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -296,14 +296,23 @@
FT_BASE_DEF( void )
FT_GlyphLoader_Add( FT_GlyphLoader loader )
{
- FT_GlyphLoad base = &loader->base;
- FT_GlyphLoad current = &loader->current;
+ FT_GlyphLoad base;
+ FT_GlyphLoad current;
- FT_UInt n_curr_contours = current->outline.n_contours;
- FT_UInt n_base_points = base->outline.n_points;
+ FT_UInt n_curr_contours;
+ FT_UInt n_base_points;
FT_UInt n;
+ if ( !loader )
+ return;
+
+ base = &loader->base;
+ current = &loader->current;
+
+ n_curr_contours = current->outline.n_contours;
+ n_base_points = base->outline.n_points;
+
base->outline.n_points =
(short)( base->outline.n_points + current->outline.n_points );
base->outline.n_contours =