[gs-cvs] rev 9528 - trunk/freetype/src/type1

[giles at ghostscript.com]

Author: giles
Date: 2009-03-03 20:47:28 -0800 (Tue, 03 Mar 2009)
New Revision: 9528

Modified:
   trunk/freetype/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.


Modified: trunk/freetype/src/type1/t1gload.c
===================================================================
--- trunk/freetype/src/type1/t1gload.c	2009-03-04 04:44:55 UTC (rev 9527)
+++ trunk/freetype/src/type1/t1gload.c	2009-03-04 04:47:28 UTC (rev 9528)
@@ -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 ) );