diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-15 22:15:31 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-15 22:15:31 +0000 |
| commit | bc44612a5acdd63ed6d6ae45b3ab65e39ab32343 (patch) | |
| tree | 963ea34a56f692b92c29dcb15496fc147a2ab4b6 | |
| parent | b17ec34df93db26c14e83df9a8c50453c509779b (diff) | |
| download | pango-bc44612a5acdd63ed6d6ae45b3ab65e39ab32343.tar.gz | |
Fix confusion between boolean and FT_Error return. (#108358, Noah Levitt)
Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c: Fix confusion between
boolean and FT_Error return. (#108358, Noah Levitt)
* pango/opentype/ftxopen.c (Get_Class1): index is
allowed to be NULL. (#108358, Noah Levitt)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rw-r--r-- | pango/opentype/ftxgpos.c | 5 | ||||
| -rw-r--r-- | pango/opentype/ftxopen.c | 3 |
7 files changed, 45 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8957b1fd..ede69396 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 8957b1fd..ede69396 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8957b1fd..ede69396 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8957b1fd..ede69396 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 012e82d8..8f872f02 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -4783,12 +4783,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; } diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c index c721eec3..b881dffa 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/ftxopen.c @@ -1252,7 +1252,8 @@ FT_UShort* cva = cdf1->ClassValueArray; - *index = 0; + if ( index ) + *index = 0; if ( glyphID >= cdf1->StartGlyph && glyphID <= cdf1->StartGlyph + cdf1->GlyphCount ) |