diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-04-15 22:15:41 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-15 22:15:41 +0000 |
commit | f1eed2fe6cacbfa317ac42b2a5164fdd17752804 (patch) | |
tree | f67ca0d4ab88862cf0f49a5a7ef43183d50b01de | |
parent | a23bba922e7fea28a9984e1a3a0abc4cb1b4c1aa (diff) | |
download | pango-f1eed2fe6cacbfa317ac42b2a5164fdd17752804.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:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 1a6a264e..99a76f81 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:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 1a6a264e..99a76f81 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:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 1a6a264e..99a76f81 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:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 1a6a264e..99a76f81 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:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index d611d7cb..a71896ca 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -4778,12 +4778,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 a072daf7..ba605bd7 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/ftxopen.c @@ -1266,7 +1266,8 @@ FT_UShort* cva = cdf1->ClassValueArray; - *index = 0; + if ( index ) + *index = 0; if ( glyphID >= cdf1->StartGlyph && glyphID <= cdf1->StartGlyph + cdf1->GlyphCount ) |