From d0563f12a799db1c26d775438146e77ba8343613 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 26 Jul 2003 02:45:28 +0000 Subject: Fix a couple of places where TTO_Err_Not_Covered wasn't considered a Fri Jul 25 22:25:48 2003 Owen Taylor * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, Lookup_ChainContextSubst2): Fix a couple of places where TTO_Err_Not_Covered wasn't considered a successful return from Get_Class -- it means use class index 0. (From FreeType, Werner Lemberg, 2001-08-06) --- ChangeLog | 9 +++++++++ ChangeLog.pre-1-10 | 9 +++++++++ ChangeLog.pre-1-4 | 9 +++++++++ ChangeLog.pre-1-6 | 9 +++++++++ ChangeLog.pre-1-8 | 9 +++++++++ pango/opentype/ftxgsub.c | 4 ++-- 6 files changed, 47 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55906fcb..d4bfab53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + Fri Jul 25 12:07:21 2003 Owen Taylor * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch] diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 55906fcb..d4bfab53 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + Fri Jul 25 12:07:21 2003 Owen Taylor * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch] diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 55906fcb..d4bfab53 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + Fri Jul 25 12:07:21 2003 Owen Taylor * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch] diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 55906fcb..d4bfab53 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + Fri Jul 25 12:07:21 2003 Owen Taylor * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch] diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 55906fcb..d4bfab53 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + Fri Jul 25 12:07:21 2003 Owen Taylor * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch] diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index 837bfe10..148b3a6c 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -2197,7 +2197,7 @@ error = Get_Class( &csf2->ClassDef, in->string[in->pos], &classes[0], NULL ); - if ( error ) + if ( error && error != TTO_Err_Not_Covered ) goto End; known_classes = 0; @@ -3571,7 +3571,7 @@ error = Get_Class( &ccsf2->InputClassDef, in->string[in->pos], &input_classes[0], NULL ); - if ( error ) + if ( error && error != TTO_Err_Not_Covered ) goto End1; cscs = &ccsf2->ChainSubClassSet[input_classes[0]]; -- cgit v1.2.1