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)
This commit is contained in:
Owen Taylor 2003-04-15 22:15:41 +00:00 committed by Owen Taylor
parent 462bd0be60
commit 73cd600798
2 changed files with 5 additions and 3 deletions

View File

@ -4778,12 +4778,13 @@
if ( class_offset ) if ( class_offset )
{ {
if ( !FILE_Seek( class_offset + base_offset ) ) if ( !FILE_Seek( class_offset + base_offset ) )
error = Load_ClassDefinition( cd, limit, stream ) == TT_Err_Ok; error = Load_ClassDefinition( cd, limit, stream );
} }
else else
error = Load_EmptyClassDefinition ( cd, stream ); 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; return error;
} }

View File

@ -1266,6 +1266,7 @@
FT_UShort* cva = cdf1->ClassValueArray; FT_UShort* cva = cdf1->ClassValueArray;
if ( index )
*index = 0; *index = 0;
if ( glyphID >= cdf1->StartGlyph && if ( glyphID >= cdf1->StartGlyph &&