[gs-cvs] rev 9589 - branches/freetype-2.3.9-gs/src/type1

[giles at ghostscript.com]

Author: giles
Date: 2009-03-24 17:53:19 -0700 (Tue, 24 Mar 2009)
New Revision: 9589

Modified:
   branches/freetype-2.3.9-gs/src/type1/t1gload.c
Log:
Disable the check for a glyph index being out of bounds in the type 1
loader with FT_CONFIG_OPTION_INCREMENTAL is defined.

When using the incremental font loader, num_glyphs is zero at this
point, so loading built-in fonts does not work.

Corresponds to c9528 on top of 2.3.8.


Modified: branches/freetype-2.3.9-gs/src/type1/t1gload.c
===================================================================
--- branches/freetype-2.3.9-gs/src/type1/t1gload.c	2009-03-25 00:37:15 UTC (rev 9588)
+++ branches/freetype-2.3.9-gs/src/type1/t1gload.c	2009-03-25 00:53:19 UTC (rev 9589)
@@ -283,12 +283,13 @@
     FT_Bool                 glyph_data_loaded = 0;
 #endif
 
-
+#ifndef FT_CONFIG_OPTION_INCREMENTAL
     if ( glyph_index >= (FT_UInt)face->root.num_glyphs )
     {
       error = T1_Err_Invalid_Argument;
       goto Exit;
     }
+#endif
 
     FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );