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)

diff --git a/src/ftxgpos.c b/src/ftxgpos.c
index c92dfea..962b666 100644 (file)
--- a/src/ftxgpos.c
+++ b/src/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/src/ftxgpos.h b/src/ftxgpos.h
index bb766c6..28d1bae 100644 (file)
--- a/src/ftxgpos.h
+++ b/src/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/src/ftxgsub.c b/src/ftxgsub.c
index 4687629..a5fb602 100644 (file)
--- a/src/ftxgsub.c
+++ b/src/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/src/ftxgsub.h b/src/ftxgsub.h
index 51dda1c..a8ffa43 100644 (file)
--- a/src/ftxgsub.h
+++ b/src/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/src/ftxopen.c b/src/ftxopen.c
index 46d3cc7..f2ebf87 100644 (file)
--- a/src/ftxopen.c
+++ b/src/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/src/ftxopen.h b/src/ftxopen.h
index 3d4f0fb..64d2820 100644 (file)
--- a/src/ftxopen.h
+++ b/src/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;