diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-07-26 14:35:29 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-26 14:35:29 +0000 |
commit | 6b0796b6c353b8734176747806ac21b3f583179f (patch) | |
tree | ca4b2cf1523545865c02d9a12121e2c0e7455577 | |
parent | 5b0bab8a7113f06ff78077bb467383a0a15d4b44 (diff) | |
download | pango-6b0796b6c353b8734176747806ac21b3f583179f.tar.gz |
Fix additional places where TTO_Err_Not_Covered wasn't considered a
Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com>
* 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)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
-rw-r--r-- | pango/opentype/ftxgpos.c | 8 |
6 files changed, 34 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ed9f94d6..723b9652 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ed9f94d6..723b9652 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ed9f94d6..723b9652 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ed9f94d6..723b9652 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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]]; |