Finish extending properties flags from FT_UShort => FT_UInt. (OTLBuffer

Fri Jul 30 17:17:05 2004  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/ftxgpos.[ch] pango/opentype/ftxgsub.[ch]
        pango/opentype/ftxopen.[ch]: Finish extending properties
        flags from FT_UShort => FT_UInt. (OTLBuffer was already
        using an FT_UInt)
This commit is contained in:
Owen Taylor 2004-07-30 21:23:04 +00:00 committed by Owen Taylor
parent f42d5eca29
commit d41089a5b6
6 changed files with 12 additions and 12 deletions

View File

@ -5974,7 +5974,7 @@
FT_Error error, retError = TTO_Err_Not_Covered;
TTO_GPOSHeader* gpos = gpi->gpos;
FT_UShort* properties = gpos->LookupList.Properties;
FT_UInt* properties = gpos->LookupList.Properties;
int nesting_level = 0;
@ -6047,12 +6047,12 @@
EXPORT_FUNC
FT_Error TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos,
FT_UShort feature_index,
FT_UShort property )
FT_UInt property )
{
FT_UShort i;
TTO_Feature feature;
FT_UShort* properties;
FT_UInt* properties;
FT_UShort* index;
/* Each feature can only be added once once */
@ -6081,7 +6081,7 @@
{
FT_UShort i;
FT_UShort* properties;
FT_UInt* properties;
if ( !gpos )

View File

@ -804,7 +804,7 @@ extern "C" {
EXPORT_DEF
FT_Error TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos,
FT_UShort feature_index,
FT_UShort property );
FT_UInt property );
EXPORT_DEF
FT_Error TT_GPOS_Clear_Features( TTO_GPOSHeader* gpos );

View File

@ -4020,7 +4020,7 @@
{
FT_Error error, retError = TTO_Err_Not_Covered;
FT_UShort* properties = gsub->LookupList.Properties;
FT_UInt* properties = gsub->LookupList.Properties;
int nesting_level = 0;
@ -4055,12 +4055,12 @@
EXPORT_FUNC
FT_Error TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub,
FT_UShort feature_index,
FT_UShort property )
FT_UInt property )
{
FT_UShort i;
TTO_Feature feature;
FT_UShort* properties;
FT_UInt* properties;
FT_UShort* index;
/* Each feature can only be added once once */
@ -4089,7 +4089,7 @@
{
FT_UShort i;
FT_UShort* properties;
FT_UInt* properties;
if ( !gsub )

View File

@ -551,7 +551,7 @@ extern "C" {
EXPORT_DEF
FT_Error TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub,
FT_UShort feature_index,
FT_UShort property );
FT_UInt property );
EXPORT_DEF
FT_Error TT_GSUB_Clear_Features( TTO_GSUBHeader* gsub );

View File

@ -708,7 +708,7 @@
if ( ALLOC_ARRAY( ll->Lookup, count, TTO_Lookup ) )
return error;
if ( ALLOC_ARRAY( ll->Properties, count, FT_UShort ) )
if ( ALLOC_ARRAY( ll->Properties, count, FT_UInt ) )
goto Fail2;
l = ll->Lookup;

View File

@ -152,7 +152,7 @@ extern "C" {
{
FT_UShort LookupCount; /* number of Lookups */
TTO_Lookup* Lookup; /* array of Lookup records */
FT_UShort* Properties; /* array of flags */
FT_UInt* Properties; /* array of flags */
};
typedef struct TTO_LookupList_ TTO_LookupList;