diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-07-27 01:09:58 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-27 01:09:58 +0000 |
| commit | 0b7f83e7fd993c3ba8ce7603603f1e5f88104e88 (patch) | |
| tree | 9b14eedd51dc959ed3d2e6375ccf1a27a302b4a9 | |
| parent | 3af1c305e019ae22aa0d39838cccb019647cc057 (diff) | |
| download | pango-0b7f83e7fd993c3ba8ce7603603f1e5f88104e88.tar.gz | |
Fix confusion between boolean and FT_Error return. (GSUB equivalent of fix
Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition):
Fix confusion between boolean and FT_Error return.
(GSUB equivalent of fix for #108358
| -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/ftxgsub.c | 5 |
6 files changed, 33 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c (Lookup_ContextPos2): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 484a0b31..e3799e38 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c (Lookup_ContextPos2): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 484a0b31..e3799e38 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c (Lookup_ContextPos2): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 484a0b31..e3799e38 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c (Lookup_ContextPos2): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 484a0b31..e3799e38 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c (Lookup_ContextPos2): diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index aedc551a..ff42dc6a 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -2969,12 +2969,13 @@ if ( class_offset ) { if ( !FILE_Seek( class_offset + base_offset ) ) - error = Load_ClassDefinition( cd, limit, stream ) == TT_Err_Ok; + error = Load_ClassDefinition( cd, limit, stream ); } else error = Load_EmptyClassDefinition ( cd, stream ); - (void)FILE_Seek( cur_offset ); + if (error == TT_Err_Ok) + (void)FILE_Seek( cur_offset ); /* Changes error as a side-effect */ return error; } |