Update bundled freetype to 2.6.1

third_party/freetype/include/freetype/internal/t1types.h

 /***************************************************************************/
 /*                                                                         */
 /*  t1types.h                                                              */
 /*                                                                         */
 /*    Basic Type1/Type2 type definitions and interface (specification      */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006, 2008, 2009, 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 80 matching lines @@
 
     T1_EncodingType  encoding_type;
     T1_EncodingRec   encoding;
 
     FT_Byte*         subrs_block;
     FT_Byte*         charstrings_block;
     FT_Byte*         glyph_names_block;
 
     FT_Int           num_subrs;
     FT_Byte**        subrs;
-    FT_PtrDist*      subrs_len;
+    FT_UInt*         subrs_len;
 
     FT_Int           num_glyphs;
     FT_String**      glyph_names;       /* array of glyph names       */
     FT_Byte**        charstrings;       /* array of glyph charstrings */
-    FT_PtrDist*      charstrings_len;
+    FT_UInt*         charstrings_len;
 
     FT_Byte          paint_type;
     FT_Byte          font_type;
     FT_Matrix        font_matrix;
     FT_Vector        font_offset;
     FT_BBox          font_bbox;
     FT_Long          font_id;
 
     FT_Fixed         stroke_width;
 
   } T1_FontRec, *T1_Font;
 
 
   typedef struct  CID_SubrsRec_
   {
-    FT_UInt    num_subrs;
+    FT_Int     num_subrs;
     FT_Byte**  code;
 
   } CID_SubrsRec, *CID_Subrs;
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
   /***                                                                   ***/
   /***                                                                   ***/
   /***                AFM FONT INFORMATION STRUCTURES                    ***/
   /***                                                                   ***/
   /***                                                                   ***/
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
 
   typedef struct  AFM_TrackKernRec_
   {
     FT_Int    degree;
     FT_Fixed  min_ptsize;
     FT_Fixed  min_kern;
     FT_Fixed  max_ptsize;
     FT_Fixed  max_kern;
 
   } AFM_TrackKernRec, *AFM_TrackKern;
 
   typedef struct  AFM_KernPairRec_
   {
-    FT_Int  index1;
-    FT_Int  index2;
-    FT_Int  x;
-    FT_Int  y;
+    FT_UInt  index1;
+    FT_UInt  index2;
+    FT_Int   x;
+    FT_Int   y;
 
   } AFM_KernPairRec, *AFM_KernPair;
 
   typedef struct  AFM_FontInfoRec_
   {
     FT_Bool        IsCIDFont;
     FT_BBox        FontBBox;
     FT_Fixed       Ascender;
     FT_Fixed       Descender;
     AFM_TrackKern  TrackKerns;   /* free if non-NULL */
-    FT_Int         NumTrackKern;
+    FT_UInt        NumTrackKern;
     AFM_KernPair   KernPairs;    /* free if non-NULL */
-    FT_Int         NumKernPair;
+    FT_UInt        NumKernPair;
 
   } AFM_FontInfoRec, *AFM_FontInfo;
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
   /***                                                                   ***/
   /***                                                                   ***/
   /***                ORIGINAL T1_FACE CLASS DEFINITION                  ***/
@@ skipping 59 matching lines @@
 
   } CID_FaceRec;
 
 
 FT_END_HEADER
 
 #endif /* __T1TYPES_H__ */
 
 
 /* END */