From eb1b83dd9e24a904107c1659e950f4c35bd6f624 Mon Sep 17 00:00:00 2001 From: Graham Asher Date: Wed, 24 Jul 2002 13:58:21 +0000 Subject: [PATCH] FIX for bug reported by Sven Neumann [sven@gimp.org] on the FreeType development forum: "If FT_CONFIG_OPTION_INCREMENTAL is undefined (this is the default), the TrueType loader crashes in line 852 of src/truetype/ttgload.c when it tries to access face->glyph_locations.". --- src/truetype/ttobjs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index 18616a047..710fb2a4e 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -201,10 +201,15 @@ #ifdef FT_CONFIG_OPTION_INCREMENTAL if ( !face->root.incremental_interface ) error = TT_Load_Locations( face, stream ); - if ( !error ) -#endif + if ( !error ) error = TT_Load_CVT ( face, stream ) || TT_Load_Programs ( face, stream ); +#else + if ( !error ) + error = TT_Load_Locations( face, stream ) || + TT_Load_CVT ( face, stream ) || + TT_Load_Programs ( face, stream ); +#endif } /* initialize standard glyph loading routines */