*** autohint/ahglobal.c.orig	Sat Nov  4 02:55:30 2000
--- autohint/ahglobal.c	Sat Mar 10 01:08:14 2001
***************
*** 165,171 ****
          /* segment; we first need to find in which contour the extremum */
          /* lies, then see its previous and next points                  */
          {
!           FT_Int  index = extremum - points;
            FT_Int  n;
            FT_Int  first, last, prev, next, end;
            FT_Pos  dist;
--- 165,171 ----
          /* segment; we first need to find in which contour the extremum */
          /* lies, then see its previous and next points                  */
          {
!           FT_Int  index = (FT_Int)(extremum - points);
            FT_Int  n;
            FT_Int  first, last, prev, next, end;
            FT_Pos  dist;
*** autohint/ahglyph.c.orig	Sat Nov  4 02:55:30 2000
--- autohint/ahglyph.c	Sat Mar 10 01:08:14 2001
***************
*** 1119,1125 ****
          }
        }
  
!       *p_num_edges = edge_limit - edges;
  
  
        /*********************************************************************/
--- 1119,1125 ----
          }
        }
  
!       *p_num_edges = (FT_Int)(edge_limit - edges);
  
  
        /*********************************************************************/
*** cache/ftcchunk.c.orig	Fri Nov 10 23:43:37 2000
--- cache/ftcchunk.c	Sat Mar 10 01:08:14 2001
***************
*** 299,305 ****
      if ( !error )
      {
        /* good, now set the set index within the set object */
!       cset->cset_index = node - lru->nodes;
        node->root.data  = cset;
      }
  
--- 299,305 ----
      if ( !error )
      {
        /* good, now set the set index within the set object */
!       cset->cset_index = (FT_UInt)(node - lru->nodes);
        node->root.data  = cset;
      }
  
*** cache/ftcglyph.c.orig	Fri Dec  1 22:43:04 2000
--- cache/ftcglyph.c	Sat Mar 10 01:08:14 2001
***************
*** 325,331 ****
      if ( !error )
      {
        /* good, now set the gset index within the gset object */
!       gset->gset_index = node - lru->nodes;
        node->root.data  = gset;
      }
  
--- 325,331 ----
      if ( !error )
      {
        /* good, now set the gset index within the gset object */
!       gset->gset_index = (FT_UInt)(node - lru->nodes);
        node->root.data  = gset;
      }
  
*** cid/cidload.c.orig	Sat Nov  4 02:55:38 2000
--- cid/cidload.c	Sat Mar 10 01:08:14 2001
***************
*** 343,349 ****
            while ( cur2 < limit && is_alpha( *cur2 ) )
              cur2++;
  
!           len = cur2 - cur;
            if ( len > 0 && len < 22 )
            {
              /* now compare the immediate name to the keyword table */
--- 343,349 ----
            while ( cur2 < limit && is_alpha( *cur2 ) )
              cur2++;
  
!           len = (FT_Int)(cur2 - cur);
            if ( len > 0 && len < 22 )
            {
              /* now compare the immediate name to the keyword table */
*** cid/cidparse.c.orig	Sat Nov  4 02:55:38 2000
--- cid/cidparse.c	Sat Mar 10 01:08:14 2001
***************
*** 119,125 ****
          if ( p[0] == 'S' && strncmp( (char*)p, "StartData", 9 ) == 0 )
          {
            /* save offset of binary data after `StartData' */
!           offset = top_position - ( limit - p ) + 10;
            goto Found;
          }
        }
--- 119,125 ----
          if ( p[0] == 'S' && strncmp( (char*)p, "StartData", 9 ) == 0 )
          {
            /* save offset of binary data after `StartData' */
!           offset = (FT_ULong)(top_position - ( limit - p ) + 10);
            goto Found;
          }
        }
*** psaux/psobjs.c.orig	Mon Nov  6 00:41:08 2000
--- psaux/psobjs.c	Sat Mar 10 01:08:15 2001
***************
*** 92,98 ****
    void  shift_elements( PS_Table*  table,
                          FT_Byte*   old_base )
    {
!     FT_Long    delta  = table->block - old_base;
      FT_Byte**  offset = table->elements;
      FT_Byte**  limit  = offset + table->max_elems;
  
--- 92,98 ----
    void  shift_elements( PS_Table*  table,
                          FT_Byte*   old_base )
    {
!     FT_Long    delta  = (FT_Long)(table->block - old_base);
      FT_Byte**  offset = table->elements;
      FT_Byte**  limit  = offset + table->max_elems;
  
***************
*** 417,423 ****
          cur++;
        }
  
!       *pnum_tokens = cur - tokens;
  
        parser->cursor = old_cursor;
        parser->limit  = old_limit;
--- 417,423 ----
          cur++;
        }
  
!       *pnum_tokens = (FT_Int)(cur - tokens);
  
        parser->cursor = old_cursor;
        parser->limit  = old_limit;
***************
*** 852,858 ****
        case t1_field_string:
          {
            FT_Memory  memory = parser->memory;
!           FT_UInt    len    = limit-cur;
  
  
            if ( *(FT_String**)q )
--- 852,858 ----
        case t1_field_string:
          {
            FT_Memory  memory = parser->memory;
!           FT_UInt    len    = (FT_UInt)(limit-cur);
  
  
            if ( *(FT_String**)q )
*** psnames/psmodule.c.orig	Sat Nov  4 02:55:40 2000
--- psnames/psmodule.c	Sat Mar 10 01:08:15 2001
***************
*** 113,119 ****
        while ( *p && *p != '.' )
          p++;
  
!       len = p - glyph_name;
  
        if ( *p && len < 64 )
        {
--- 113,119 ----
        while ( *p && *p != '.' )
          p++;
  
!       len = (int)(p - glyph_name);
  
        if ( *p && len < 64 )
        {
***************
*** 194,200 ****
        }
  
        /* now, compress the table a bit */
!       count = map - table->maps;
  
        if ( count > 0 && REALLOC( table->maps,
                                   num_glyphs * sizeof ( PS_UniMap ),
--- 194,200 ----
        }
  
        /* now, compress the table a bit */
!       count = (FT_UInt)(map - table->maps);
  
        if ( count > 0 && REALLOC( table->maps,
                                   num_glyphs * sizeof ( PS_UniMap ),
*** raster/ftraster.c.orig	Sat Nov  4 02:55:40 2000
--- raster/ftraster.c	Sat Mar 10 01:08:15 2001
***************
*** 623,629 ****
      PProfile  oldProfile;
  
  
!     h = ras.top - ras.cProfile->offset;
  
      if ( h < 0 )
      {
--- 623,629 ----
      PProfile  oldProfile;
  
  
!     h = (Long)(ras.top - ras.cProfile->offset);
  
      if ( h < 0 )
      {
***************
*** 1105,1111 ****
      else
      {
        e  = CEILING( y1 );
!       f1 = FRAC( y1 );
        e0 = e;
  
        if ( f1 == 0 )
--- 1105,1111 ----
      else
      {
        e  = CEILING( y1 );
!       f1 = (Short)(FRAC( y1 ));
        e0 = e;
  
        if ( f1 == 0 )
***************
*** 2192,2198 ****
            e1 = TRUNC( e1 );
  
            c1 = (Short)( e1 >> 3 );
!           f1 = e1 &  7;
  
            if ( e1 >= 0 && e1 < ras.bWidth                      &&
                 ras.bTarget[ras.traceOfs + c1] & ( 0x80 >> f1 ) )
--- 2192,2198 ----
            e1 = TRUNC( e1 );
  
            c1 = (Short)( e1 >> 3 );
!           f1 = (Short)(e1 &  7);
  
            if ( e1 >= 0 && e1 < ras.bWidth                      &&
                 ras.bTarget[ras.traceOfs + c1] & ( 0x80 >> f1 ) )
***************
*** 2218,2224 ****
      if ( e1 >= 0 && e1 < ras.bWidth )
      {
        c1 = (Short)( e1 >> 3 );
!       f1 = e1 & 7;
  
        if ( ras.gray_min_x > c1 ) ras.gray_min_x = c1;
        if ( ras.gray_max_x < c1 ) ras.gray_max_x = c1;
--- 2218,2224 ----
      if ( e1 >= 0 && e1 < ras.bWidth )
      {
        c1 = (Short)( e1 >> 3 );
!       f1 = (Short)(e1 & 7);
  
        if ( ras.gray_min_x > c1 ) ras.gray_min_x = c1;
        if ( ras.gray_max_x < c1 ) ras.gray_max_x = c1;
***************
*** 2680,2686 ****
        Q = P->link;
  
        bottom = (Short)P->start;
!       top    = (Short)P->start + P->height - 1;
  
        if ( min_Y > bottom ) min_Y = bottom;
        if ( max_Y < top    ) max_Y = top;
--- 2680,2686 ----
        Q = P->link;
  
        bottom = (Short)P->start;
!       top    = (Short)(P->start + P->height - 1);
  
        if ( min_Y > bottom ) min_Y = bottom;
        if ( max_Y < top    ) max_Y = top;
***************
*** 2708,2714 ****
  
      while ( P )
      {
!       P->countL = P->start - min_Y;
        P = P->link;
      }
  
--- 2708,2714 ----
  
      while ( P )
      {
!       P->countL = (UShort)(P->start - min_Y);
        P = P->link;
      }
  
*** sfnt/sfdriver.c.orig	Wed Nov 29 16:18:53 2000
--- sfnt/sfdriver.c	Sat Mar 10 01:08:15 2001
***************
*** 117,123 ****
      error = TT_Get_PS_Name( face, glyph_index, &gname );
      if ( !error && buffer_max > 0 )
      {
!       FT_UInt  len = strlen( gname );
  
  
        if ( len >= buffer_max )
--- 117,123 ----
      error = TT_Get_PS_Name( face, glyph_index, &gname );
      if ( !error && buffer_max > 0 )
      {
!       FT_UInt  len = (FT_UInt)(strlen( gname ));
  
  
        if ( len >= buffer_max )
*** sfnt/ttcmap.c.orig	Fri Dec  1 00:48:15 2000
--- sfnt/ttcmap.c	Sat Mar 10 01:08:15 2001
***************
*** 503,512 ****
      else
      {
        /* otherwise, we must use the glyphIdArray to do it */
!       index1 = seg4->idRangeOffset / 2
                 + ( charCode - seg4->startCount )
                 + ( seg4 - cmap4->segments )
!                - segCount;
  
        if ( index1 < (FT_UInt)cmap4->numGlyphId       &&
             cmap4->glyphIdArray[index1] != 0 )
--- 503,512 ----
      else
      {
        /* otherwise, we must use the glyphIdArray to do it */
!       index1 = (FT_UInt)(seg4->idRangeOffset / 2
                 + ( charCode - seg4->startCount )
                 + ( seg4 - cmap4->segments )
!                - segCount);
  
        if ( index1 < (FT_UInt)cmap4->numGlyphId       &&
             cmap4->glyphIdArray[index1] != 0 )
*** smooth/ftgrays.c.orig	Tue Oct 24 00:46:56 2000
--- smooth/ftgrays.c	Sat Mar 10 01:08:15 2001
***************
*** 1046,1052 ****
  
      for (;;)
      {
!       int    len = limit - base;
        PCell  i, j, pivot;
  
  
--- 1046,1052 ----
  
      for (;;)
      {
!       int    len = (int)(limit - base);
        PCell  i, j, pivot;
  
  
*** truetype/ttgload.c.orig	Fri Dec  1 00:48:21 2000
--- truetype/ttgload.c	Sat Mar 10 01:08:16 2001
***************
*** 502,508 ****
        /* composite instructions, if we find some.               */
        /* we will process them later...                          */
        /*                                                        */
!       loader->ins_pos = FILE_Pos() + stream->cursor - stream->limit;
      }
  #endif
  
--- 502,508 ----
        /* composite instructions, if we find some.               */
        /* we will process them later...                          */
        /*                                                        */
!       loader->ins_pos = (FT_ULong)(FILE_Pos() + stream->cursor - stream->limit);
      }
  #endif
  
*** type1/t1afm.c.orig	Sat Nov  4 02:55:45 2000
--- type1/t1afm.c	Sat Mar 10 01:08:16 2001
***************
*** 84,90 ****
      while ( IS_ALPHANUM( *p ) && p < limit )
        p++;
  
!     len = p - *start;
  
      if ( len > 0 && len < 64 )
      {
--- 84,90 ----
      while ( IS_ALPHANUM( *p ) && p < limit )
        p++;
  
!     len = (FT_Int)(p - *start);
  
      if ( len > 0 && len < 64 )
      {
*** type1/t1driver.c.orig	Wed Nov 29 16:18:54 2000
--- type1/t1driver.c	Sat Mar 10 01:08:16 2001
***************
*** 69,75 ****
  
      if ( buffer_max > 0 )
      {
!       FT_UInt  len = strlen( gname );
  
  
        if (len >= buffer_max)
--- 69,75 ----
  
      if ( buffer_max > 0 )
      {
!       FT_UInt  len = (FT_UInt)(strlen( gname ));
  
  
        if (len >= buffer_max)
*** type1/t1load.c.orig	Fri Dec  1 22:43:05 2000
--- type1/t1load.c	Sat Mar 10 01:08:16 2001
***************
*** 430,436 ****
        if (token->start[0] == '/')
          token->start++;
  
!       len = token->limit - token->start;
        if ( len <= 0 )
        {
          error = T1_Err_Invalid_File_Format;
--- 430,436 ----
        if (token->start[0] == '/')
          token->start++;
  
!       len = (FT_Int)(token->limit - token->start);
        if ( len <= 0 )
        {
          error = T1_Err_Invalid_File_Format;
***************
*** 848,854 ****
      while ( cur2 < limit && is_alpha( *cur2 ) )
        cur2++;
  
!     len = cur2 - cur;
      if ( len > 0 )
      {
        if ( ALLOC( face->type1.font_name, len + 1 ) )
--- 848,854 ----
      while ( cur2 < limit && is_alpha( *cur2 ) )
        cur2++;
  
!     len = (FT_Int)(cur2 - cur);
      if ( len > 0 )
      {
        if ( ALLOC( face->type1.font_name, len + 1 ) )
***************
*** 1040,1046 ****
              while ( cur2 < limit && is_alpha( *cur2 ) )
                cur2++;
  
!             len = cur2 - cur - 1;
  
              parser->root.error = T1_Add_Table( char_table, charcode,
                                            cur + 1, len + 1 );
--- 1040,1046 ----
              while ( cur2 < limit && is_alpha( *cur2 ) )
                cur2++;
  
!             len = (FT_Int)(cur2 - cur - 1);
  
              parser->root.error = T1_Add_Table( char_table, charcode,
                                            cur + 1, len + 1 );
***************
*** 1245,1251 ****
  
          while ( cur2 < limit && is_alpha( *cur2 ) )
            cur2++;
!         len = cur2 - cur - 1;
  
          error = T1_Add_Table( name_table, n, cur + 1, len + 1 );
          if ( error )
--- 1245,1251 ----
  
          while ( cur2 < limit && is_alpha( *cur2 ) )
            cur2++;
!         len = (FT_Int)(cur2 - cur - 1);
  
          error = T1_Add_Table( name_table, n, cur + 1, len + 1 );
          if ( error )
***************
*** 1476,1482 ****
            while ( cur2 < limit && is_alpha( *cur2 ) )
              cur2++;
  
!           len  = cur2 - cur;
            if ( len > 0 && len < 22 )
            {
              if ( !loader->fontdata )
--- 1476,1482 ----
            while ( cur2 < limit && is_alpha( *cur2 ) )
              cur2++;
  
!           len  = (FT_Int)(cur2 - cur);
            if ( len > 0 && len < 22 )
            {
              if ( !loader->fontdata )
*** type1/t1parse.c.orig	Thu Nov 23 09:21:13 2000
--- type1/t1parse.c	Sat Mar 10 01:08:16 2001
***************
*** 387,393 ****
        /* dictionary.  We overwrite the base dictionary for disk-based */
        /* resources and allocate a new block otherwise                 */
  
!       size = parser->base_len - ( cur - parser->base_dict);
  
        if ( parser->in_memory )
        {
--- 387,393 ----
        /* dictionary.  We overwrite the base dictionary for disk-based */
        /* resources and allocate a new block otherwise                 */
  
!       size = (FT_Long)(parser->base_len - ( cur - parser->base_dict));
  
        if ( parser->in_memory )
        {
***************
*** 450,456 ****
          }
  
          /* put a safeguard */
!         parser->private_len = write - parser->private_dict;
          *write++ = 0;
        }
      }
--- 450,456 ----
          }
  
          /* put a safeguard */
!         parser->private_len = (FT_Int)(write - parser->private_dict);
          *write++ = 0;
        }
      }
*** winfonts/winfnt.c.orig	Wed Nov 29 16:18:54 2000
--- winfonts/winfnt.c	Sat Mar 10 01:08:16 2001
***************
*** 251,257 ****
            if ( type_id == 0x8008 )
            {
              font_count  = count;
!             font_offset = FILE_Pos() + 4 + ( stream->cursor - stream->limit );
              break;
            }
  
--- 251,257 ----
            if ( type_id == 0x8008 )
            {
              font_count  = count;
!             font_offset = (FT_ULong)(FILE_Pos() + 4 + ( stream->cursor - stream->limit ));
              break;
            }