Update bundled freetype to 2.6.1

third_party/freetype/src/type1/t1afm.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1afm.c                                                                */
 /*                                                                         */
 /*    AFM support for Type 1 fonts (body).                                 */
 /*                                                                         */
-/*  Copyright 1996-2011, 2013 by                                           */
+/*  Copyright 1996-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
@@ skipping 144 matching lines @@
 
     /* Actually, kerning pairs are simply optional! */
     if ( fi->NumKernPair == 0 )
       goto Exit;
 
     /* allocate the pairs */
     if ( FT_QNEW_ARRAY( fi->KernPairs, fi->NumKernPair ) )
       goto Exit;
 
     /* now, read each kern pair */
-    kp             = fi->KernPairs;
-    limit          = p + 4 * fi->NumKernPair;
+    kp    = fi->KernPairs;
+    limit = p + 4 * fi->NumKernPair;
 
     /* PFM kerning data are stored by encoding rather than glyph index, */
     /* so find the PostScript charmap of this font and install it       */
     /* temporarily.  If we find no PostScript charmap, then just use    */
     /* the default and hope it is the right one.                        */
     oldcharmap = t1_face->charmap;
     charmap    = NULL;
 
     for ( n = 0; n < t1_face->num_charmaps; n++ )
     {
@@ skipping 171 matching lines @@
   }
 
 
   FT_LOCAL_DEF( FT_Error )
   T1_Get_Track_Kerning( FT_Face    face,
                         FT_Fixed   ptsize,
                         FT_Int     degree,
                         FT_Fixed*  kerning )
   {
     AFM_FontInfo  fi = (AFM_FontInfo)( (T1_Face)face )->afm_data;
-    FT_Int        i;
+    FT_UInt       i;
 
 
     if ( !fi )
       return FT_THROW( Invalid_Argument );
 
     for ( i = 0; i < fi->NumTrackKern; i++ )
     {
       AFM_TrackKern  tk = fi->TrackKerns + i;
 
 
@@ skipping 11 matching lines @@
                               tk->max_ptsize - tk->min_ptsize ) +
                    tk->min_kern;
       }
     }
 
     return FT_Err_Ok;
   }
 
 
 /* END */