From ce09aeccb4d1594d900dfd57a9a50dfc845046be Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 26 Jul 2003 14:35:08 +0000 Subject: Fix additional places where TTO_Err_Not_Covered wasn't considered a Sat Jul 26 10:30:24 2003 Owen Taylor * pango/opentype/ftxgpos.c: Fix additional places where TTO_Err_Not_Covered wasn't considered a successful return from Get_Class. (From Qt, Lars Knoll) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/opentype/ftxgpos.c | 8 ++++---- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b65346ad..45061f2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + Sat Jul 26 09:41:22 2003 Owen Taylor * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b65346ad..45061f2f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + Sat Jul 26 09:41:22 2003 Owen Taylor * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b65346ad..45061f2f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + Sat Jul 26 09:41:22 2003 Owen Taylor * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b65346ad..45061f2f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + Sat Jul 26 09:41:22 2003 Owen Taylor * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b65346ad..45061f2f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + Sat Jul 26 09:41:22 2003 Owen Taylor * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index c34696cb..96eb80ef 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -1665,11 +1665,11 @@ error = Get_Class( &ppf2->ClassDef1, in->string[first_pos], &cl1, NULL ); - if ( error ) + if ( error && error != TTO_Err_Not_Covered ) return error; error = Get_Class( &ppf2->ClassDef2, in->string[in->pos], &cl2, NULL ); - if ( error ) + if ( error && error != TTO_Err_Not_Covered ) return error; c1r = &ppf2->Class1Record[cl1]; @@ -4036,7 +4036,7 @@ error = Get_Class( &cpf2->ClassDef, in->string[in->pos], &classes[0], NULL ); - if ( error ) + if ( error && error != TTO_Err_Not_Covered ) goto End; known_classes = 0; @@ -5416,7 +5416,7 @@ error = Get_Class( &ccpf2->InputClassDef, in->string[in->pos], &input_classes[0], NULL ); - if ( error ) + if ( error && error != TTO_Err_Not_Covered ) goto End1; cpcs = &ccpf2->ChainPosClassSet[input_classes[0]]; -- cgit v1.2.1