* include/freetype/internal/psglobals.h (removed),

          include/freetype/internal/pshints.h,
          src/pshinter/pshglob.h: removing obsolete file

        * include/freetype/internal/tttypes.h,
          include/freetype/internal/sfnt.h,
          src/base/ftnames.c, src/cff/cffdrivr.c,
          src/sfnt/*.c, src/truetype/*.c: updated SFNT/TrueType type
          definitions

6 files changed, 37 insertions, 37 deletions

diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 5b5ba7009..d54c57aea 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -94,7 +94,7 @@
                FT_UInt     right_glyph,
                FT_Vector*  kerning )
   {
-    TT_Kern_0_Pair*  pair;
+    TT_Kern0_Pair  pair;
 
 
     if ( !face )
@@ -367,7 +367,7 @@
   {
     FT_Error       error;
     TT_Face        face;
-    TT_CMapTable*  cmap;
+    TT_CMapTable   cmap;
 
 
     cmap = &charmap->cmap;
@@ -414,7 +414,7 @@
   {
     FT_Error       error;
     TT_Face        face;
-    TT_CMapTable*  cmap;
+    TT_CMapTable   cmap;
 
 
     cmap = &charmap->cmap;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 5201a671a..b5100bc23 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -87,20 +87,20 @@
                   FT_Short*       bearing,
                   FT_UShort*      advance )
   {
-    TT_LongMetrics*  longs_m;
+    TT_LongMetrics   longs_m;
     FT_UShort        k = header->number_Of_HMetrics;
 
 
     if ( idx < (FT_UInt)k )
     {
-      longs_m  = (TT_LongMetrics*)header->long_metrics + idx;
+      longs_m  = (TT_LongMetrics )header->long_metrics + idx;
       *bearing = longs_m->bearing;
       *advance = longs_m->advance;
     }
     else
     {
       *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
-      *advance = ((TT_LongMetrics*)header->long_metrics)[k - 1].advance;
+      *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
     }
   }
 
@@ -175,7 +175,7 @@
 
 
   static void
-  tt_prepare_zone( TT_GlyphZone*  zone,
+  tt_prepare_zone( TT_GlyphZone   zone,
                    FT_GlyphLoad   load,
                    FT_UInt        start_point,
                    FT_UInt        start_contour )
@@ -202,7 +202,7 @@
   /*************************************************************************/
 
   FT_CALLBACK_DEF( FT_Error )
-  TT_Access_Glyph_Frame( TT_Loader*  loader,
+  TT_Access_Glyph_Frame( TT_Loader   loader,
                          FT_UInt     glyph_index,
                          FT_ULong    offset,
                          FT_UInt     byte_count )
@@ -225,7 +225,7 @@
 
 
   FT_CALLBACK_DEF( void )
-  TT_Forget_Glyph_Frame( TT_Loader*  loader )
+  TT_Forget_Glyph_Frame( TT_Loader   loader )
   {
     FT_Stream  stream = loader->stream;
 
@@ -235,7 +235,7 @@
 
 
   FT_CALLBACK_DEF( FT_Error )
-  TT_Load_Glyph_Header( TT_Loader*  loader )
+  TT_Load_Glyph_Header( TT_Loader   loader )
   {
     FT_Stream   stream   = loader->stream;
     FT_Int      byte_len = loader->byte_len - 10;
@@ -263,7 +263,7 @@
 
 
   FT_CALLBACK_DEF( FT_Error )
-  TT_Load_Simple_Glyph( TT_Loader*  load )
+  TT_Load_Simple_Glyph( TT_Loader   load )
   {
     FT_Error         error;
     FT_Stream        stream     = load->stream;
@@ -466,7 +466,7 @@
 
 
   FT_CALLBACK_DEF( FT_Error )
-  TT_Load_Composite_Glyph( TT_Loader*  loader )
+  TT_Load_Composite_Glyph( TT_Loader   loader )
   {
     FT_Error         error;
     FT_Stream        stream  = loader->stream;
@@ -603,7 +603,7 @@
   /*    interpretation.                                                    */
   /*                                                                       */
   static FT_Error
-  TT_Process_Simple_Glyph( TT_Loader*  load,
+  TT_Process_Simple_Glyph( TT_Loader   load,
                            FT_Bool     debug )
   {
     FT_GlyphLoader   gloader  = load->gloader;
@@ -612,7 +612,7 @@
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
     FT_UInt          n_ins;
 #endif
-    TT_GlyphZone*    zone     = &load->zone;
+    TT_GlyphZone     zone     = &load->zone;
     FT_Error         error    = TT_Err_Ok;
 
     FT_UNUSED( debug );  /* used by truetype interpreter only */
@@ -737,7 +737,7 @@
   /*    TT_Loader object.                                                  */
   /*                                                                       */
   static FT_Error
-  load_truetype_glyph( TT_Loader*  loader,
+  load_truetype_glyph( TT_Loader   loader,
                        FT_UInt     glyph_index )
   {
 
@@ -1103,7 +1103,7 @@
         {
           FT_UShort       n_ins;
           TT_ExecContext  exec = loader->exec;
-          TT_GlyphZone*   pts;
+          TT_GlyphZone    pts;
           FT_Vector*      pp1;
 
 
@@ -1210,7 +1210,7 @@
 
 
   static void
-  compute_glyph_metrics( TT_Loader*  loader,
+  compute_glyph_metrics( TT_Loader   loader,
                          FT_UInt     glyph_index )
   {
     FT_BBox       bbox;
@@ -1426,7 +1426,7 @@
     TT_Face          face;
     FT_Stream        stream;
     FT_Error         error;
-    TT_Loader        loader;
+    TT_LoaderRec     loader;
 
 
     face   = (TT_Face)glyph->face;
@@ -1457,7 +1457,7 @@
          ( load_flags & FT_LOAD_NO_BITMAP ) == 0 )
 
     {
-      TT_SBit_Metrics  metrics;
+      TT_SBit_MetricsRec  metrics;
 
 
       error = sfnt->load_sbit_image( face,
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 1c08addc7..f9c64253a 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -1397,7 +1397,7 @@
   /*    zone     :: The affected glyph zone.                               */
   /*                                                                       */
   static void
-  Direct_Move( EXEC_OP_ TT_GlyphZone*  zone,
+  Direct_Move( EXEC_OP_ TT_GlyphZone   zone,
                         FT_UShort      point,
                         FT_F26Dot6     distance )
   {
@@ -1459,7 +1459,7 @@
 
 
   static void
-  Direct_Move_X( EXEC_OP_ TT_GlyphZone*  zone,
+  Direct_Move_X( EXEC_OP_ TT_GlyphZone   zone,
                           FT_UShort      point,
                           FT_F26Dot6     distance )
   {
@@ -1471,7 +1471,7 @@
 
 
   static void
-  Direct_Move_Y( EXEC_OP_ TT_GlyphZone*  zone,
+  Direct_Move_Y( EXEC_OP_ TT_GlyphZone   zone,
                           FT_UShort      point,
                           FT_F26Dot6     distance )
   {
@@ -4983,10 +4983,10 @@
   static FT_Bool
   Compute_Point_Displacement( EXEC_OP_ FT_F26Dot6*    x,
                                        FT_F26Dot6*    y,
-                                       TT_GlyphZone*  zone,
+                                       TT_GlyphZone   zone,
                                        FT_UShort*     refp )
   {
-    TT_GlyphZone  zp;
+    TT_GlyphZoneRec  zp;
     FT_UShort     p;
     FT_F26Dot6    d;
 
@@ -5065,7 +5065,7 @@
   static void
   Ins_SHP( INS_ARG )
   {
-    TT_GlyphZone  zp;
+    TT_GlyphZoneRec  zp;
     FT_UShort     refp;
 
     FT_F26Dot6    dx,
@@ -5118,7 +5118,7 @@
   static void
   Ins_SHC( INS_ARG )
   {
-    TT_GlyphZone zp;
+    TT_GlyphZoneRec zp;
     FT_UShort    refp;
     FT_F26Dot6   dx,
                  dy;
@@ -5174,7 +5174,7 @@
   static void
   Ins_SHZ( INS_ARG )
   {
-    TT_GlyphZone zp;
+    TT_GlyphZoneRec zp;
     FT_UShort    refp;
     FT_F26Dot6   dx,
                  dy;
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index d0f22b018..96d831660 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -73,7 +73,7 @@ FT_BEGIN_HEADER
 
   /* Point displacement along the freedom vector routine */
   typedef void
-  (*TT_Move_Func)( EXEC_OP_ TT_GlyphZone*  zone,
+  (*TT_Move_Func)( EXEC_OP_ TT_GlyphZone   zone,
                             FT_UShort      point,
                             FT_F26Dot6     distance );
 
@@ -130,7 +130,7 @@ FT_BEGIN_HEADER
     FT_Long         args;
     FT_UInt         new_top;    /* new top after exec.  */
 
-    TT_GlyphZone    zp0,        /* zone records */
+    TT_GlyphZoneRec    zp0,        /* zone records */
                     zp1,
                     zp2,
                     pts,
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 97575127e..99ed5d052 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -66,7 +66,7 @@
   /*    zone :: A pointer to the target glyph zone.                        */
   /*                                                                       */
   FT_LOCAL_DEF( void )
-  TT_Done_GlyphZone( TT_GlyphZone*  zone )
+  TT_Done_GlyphZone( TT_GlyphZone   zone )
   {
     FT_Memory  memory = zone->memory;
 
@@ -106,7 +106,7 @@
   TT_New_GlyphZone( FT_Memory      memory,
                     FT_UShort      maxPoints,
                     FT_Short       maxContours,
-                    TT_GlyphZone*  zone )
+                    TT_GlyphZone   zone )
   {
     FT_Error  error;
 
@@ -698,7 +698,7 @@
 
     if ( !error )
     {
-      TT_SBit_Strike*  strike = face->sbit_strikes + strike_index;
+      TT_SBit_Strike   strike = face->sbit_strikes + strike_index;
 
 
       sbit_metrics->x_ppem      = metrics->x_ppem;
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 2f6a58b58..eb09a4085 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -108,13 +108,13 @@ FT_BEGIN_HEADER
 #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
   FT_LOCAL( void )
-  TT_Done_GlyphZone( TT_GlyphZone*  zone );
+  TT_Done_GlyphZone( TT_GlyphZone   zone );
 
   FT_LOCAL( FT_Error )
   TT_New_GlyphZone( FT_Memory      memory,
                     FT_UShort      maxPoints,
                     FT_Short       maxContours,
-                    TT_GlyphZone*  zone );
+                    TT_GlyphZone   zone );
 
 #endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
 
@@ -203,7 +203,7 @@ FT_BEGIN_HEADER
     FT_Pos        left_bearing;
     FT_Pos        advance;
 
-    TT_GlyphZone  zone;
+    TT_GlyphZoneRec  zone;
 
     FT_Long       arg1;         /* first argument                      */
     FT_Long       arg2;         /* second argument                     */
@@ -343,7 +343,7 @@ FT_BEGIN_HEADER
     FT_UShort          storage_size; /* The storage area is now part of */
     FT_Long*           storage;      /* the instance                    */
 
-    TT_GlyphZone       twilight;     /* The instance's twilight zone    */
+    TT_GlyphZoneRec       twilight;     /* The instance's twilight zone    */
 
     /* debugging variables */
 
@@ -367,7 +367,7 @@ FT_BEGIN_HEADER
   {
     FT_DriverRec    root;
     TT_ExecContext  context;  /* execution context        */
-    TT_GlyphZone    zone;     /* glyph loader points zone */
+    TT_GlyphZoneRec    zone;     /* glyph loader points zone */
 
     void*           extension_component;