Update bundled freetype to 2.6.1

third_party/freetype/include/freetype/internal/psaux.h

 /***************************************************************************/
 /*                                                                         */
 /*  psaux.h                                                                */
 /*                                                                         */
 /*    Auxiliary functions and data structures related to PostScript fonts  */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006, 2008, 2009, 2012 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 45 matching lines @@
   {
     FT_Error
     (*init)( PS_Table   table,
              FT_Int     count,
              FT_Memory  memory );
 
     void
     (*done)( PS_Table  table );
 
     FT_Error
-    (*add)( PS_Table    table,
-            FT_Int      idx,
-            void*       object,
-            FT_PtrDist  length );
+    (*add)( PS_Table  table,
+            FT_Int    idx,
+            void*     object,
+            FT_UInt   length );
 
     void
     (*release)( PS_Table  table );
 
   } PS_Table_FuncsRec;
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Struct>                                                              */
@@ skipping 27 matching lines @@
   /*    memory    :: The object used for memory operations                 */
   /*                 (alloc/realloc).                                      */
   /*                                                                       */
   /*    funcs     :: A table of method pointers for this object.           */
   /*                                                                       */
   typedef struct  PS_TableRec_
   {
     FT_Byte*           block;          /* current memory block           */
     FT_Offset          cursor;         /* current cursor in memory block */
     FT_Offset          capacity;       /* current size of memory block   */
-    FT_Long            init;
+    FT_ULong           init;
 
     FT_Int             max_elems;
     FT_Int             num_elems;
     FT_Byte**          elements;       /* addresses of table elements */
-    FT_PtrDist*        lengths;        /* lengths of table elements   */
+    FT_UInt*           lengths;        /* lengths of table elements   */
 
     FT_Memory          memory;
     PS_Table_FuncsRec  funcs;
 
   } PS_TableRec;
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
@@ skipping 217 matching lines @@
     FT_Long
     (*to_int)( PS_Parser  parser );
     FT_Fixed
     (*to_fixed)( PS_Parser  parser,
                  FT_Int     power_ten );
 
     FT_Error
     (*to_bytes)( PS_Parser  parser,
                  FT_Byte*   bytes,
                  FT_Offset  max_bytes,
-                 FT_Long*   pnum_bytes,
+                 FT_ULong*  pnum_bytes,
                  FT_Bool    delimiters );
 
     FT_Int
     (*to_coord_array)( PS_Parser  parser,
                        FT_Int     max_coords,
                        FT_Short*  coords );
     FT_Int
     (*to_fixed_array)( PS_Parser  parser,
                        FT_Int     max_values,
                        FT_Fixed*  values,
@@ skipping 289 matching lines @@
     FT_Long*             top;
 
     T1_Decoder_ZoneRec   zones[T1_MAX_SUBRS_CALLS + 1];
     T1_Decoder_Zone      zone;
 
     FT_Service_PsCMaps   psnames;      /* for seac */
     FT_UInt              num_glyphs;
     FT_Byte**            glyph_names;
 
     FT_Int               lenIV;        /* internal for sub routine calls */
-    FT_UInt              num_subrs;
+    FT_Int               num_subrs;
     FT_Byte**            subrs;
-    FT_PtrDist*          subrs_len;    /* array of subrs length (optional) */
+    FT_UInt*             subrs_len;    /* array of subrs length (optional) */
 
     FT_Matrix            font_matrix;
     FT_Vector            font_offset;
 
     FT_Int               flex_state;
     FT_Int               num_flex_vectors;
     FT_Vector            flex_vectors[7];
 
     PS_Blend             blend;       /* for multiple master support */
 
@@ skipping 177 matching lines @@
         IS_PS_DELIM( (cur)[sizeof ( (token) ) - 1] ) ) )             && \
     ft_strncmp( (char*)(cur), (token), sizeof ( (token) ) - 1 ) == 0 )
 
 
 FT_END_HEADER
 
 #endif /* __PSAUX_H__ */
 
 
 /* END */