diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-07-30 21:23:04 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-07-30 21:23:04 +0000 |
commit | 2d40d7568d436bae3bf74d46d08cded8dfa612fa (patch) | |
tree | 880f02d61aa3229ef4194179f9d93616f6ea4fbd /pango | |
parent | c97ace5813a9c60b80a54f133b7b23fefccba97d (diff) | |
download | pango-2d40d7568d436bae3bf74d46d08cded8dfa612fa.tar.gz |
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)
Diffstat (limited to 'pango')
-rw-r--r-- | pango/opentype/ftxgpos.c | 8 | ||||
-rw-r--r-- | pango/opentype/ftxgpos.h | 2 | ||||
-rw-r--r-- | pango/opentype/ftxgsub.c | 8 | ||||
-rw-r--r-- | pango/opentype/ftxgsub.h | 2 | ||||
-rw-r--r-- | pango/opentype/ftxopen.c | 2 | ||||
-rw-r--r-- | pango/opentype/ftxopen.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index c92dfead..962b6663 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -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 ) diff --git a/pango/opentype/ftxgpos.h b/pango/opentype/ftxgpos.h index bb766c65..28d1bae0 100644 --- a/pango/opentype/ftxgpos.h +++ b/pango/opentype/ftxgpos.h @@ -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 ); diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index 46876292..a5fb6026 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -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 ) diff --git a/pango/opentype/ftxgsub.h b/pango/opentype/ftxgsub.h index 51dda1c1..a8ffa438 100644 --- a/pango/opentype/ftxgsub.h +++ b/pango/opentype/ftxgsub.h @@ -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 ); diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c index 46d3cc7e..f2ebf87a 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/ftxopen.c @@ -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; diff --git a/pango/opentype/ftxopen.h b/pango/opentype/ftxopen.h index 3d4f0fb9..64d2820d 100644 --- a/pango/opentype/ftxopen.h +++ b/pango/opentype/ftxopen.h @@ -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; |