Commit 2b21a932f18d4887e5753a41a3303153afdbd418
2006-08-16T09:24:32
* src/base/ftobjs.c (ft_validator_run): disabling function, it is buggy by design, so it will always return -1
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/ChangeLog b/ChangeLog
index a88e452..af494fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* src/cid/cidgload.c (cid_slot_load_glyph),
src/truetype/ttgload.c (tt_prepare_zone): removing compiler warnings
+ * src/base/ftobjs.c (ft_validator_run): disabling function, it is
+ buggy by design, so it will always return -1
+
2006-08-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* modules.cfg (BASE_EXTENSIONS): Compile in ftgxval.c by default to
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 6e3f439..6ab7144 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -78,11 +78,8 @@
FT_BASE_DEF( FT_Int )
ft_validator_run( FT_Validator valid )
{
- int result;
-
-
- result = ft_setjmp( valid->jump_buffer );
- return result;
+ /* this function is so buggy, none should be calling it */
+ return -1;
}
@@ -3721,7 +3718,7 @@
/* Close all modules in the library */
#if 1
/* XXX Modules are removed in the reversed order so that */
- /* type42 module is removed before truetype module. This */
+ /* type42 module is removed before truetype module. This */
/* avoids double free in some occasions. It is a hack. */
while ( library->num_modules > 0 )
FT_Remove_Module( library,
@@ -3861,7 +3858,7 @@
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
-
+
FT_EXPORT_DEF( FT_Error )
FT_Get_SubGlyph_Info( FT_GlyphSlot glyph,
FT_UInt sub_index,
@@ -3872,14 +3869,14 @@
FT_Matrix *p_transform )
{
FT_Error error = FT_Err_Invalid_Argument;
-
- if ( glyph != NULL &&
+
+ if ( glyph != NULL &&
glyph->format == FT_GLYPH_FORMAT_COMPOSITE &&
sub_index < glyph->num_subglyphs )
{
FT_SubGlyph subg = glyph->subglyphs + sub_index;
-
+
*p_index = subg->index;
*p_flags = subg->flags;