Update bundled freetype to 2.6.1

third_party/freetype/src/psaux/t1cmap.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1cmap.c                                                               */
 /*                                                                         */
 /*    Type 1 character map support (body).                                 */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2006, 2007, 2012 by                              */
+/*  Copyright 2002-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 14 matching lines @@
   /*************************************************************************/
 
   static void
   t1_cmap_std_init( T1_CMapStd  cmap,
                     FT_Int      is_expert )
   {
     T1_Face             face    = (T1_Face)FT_CMAP_FACE( cmap );
     FT_Service_PsCMaps  psnames = (FT_Service_PsCMaps)face->psnames;
 
 
-    cmap->num_glyphs    = face->type1.num_glyphs;
+    cmap->num_glyphs    = (FT_UInt)face->type1.num_glyphs;
     cmap->glyph_names   = (const char* const*)face->type1.glyph_names;
     cmap->sid_to_string = psnames->adobe_std_strings;
     cmap->code_to_sid   = is_expert ? psnames->adobe_expert_encoding
                                     : psnames->adobe_std_encoding;
 
     FT_ASSERT( cmap->code_to_sid != NULL );
   }
 
 
   FT_CALLBACK_DEF( void )
@@ skipping 129 matching lines @@
   FT_CALLBACK_DEF( FT_Error )
   t1_cmap_custom_init( T1_CMapCustom  cmap,
                        FT_Pointer     pointer )
   {
     T1_Face      face     = (T1_Face)FT_CMAP_FACE( cmap );
     T1_Encoding  encoding = &face->type1.encoding;
 
     FT_UNUSED( pointer );
 
 
-    cmap->first   = encoding->code_first;
-    cmap->count   = (FT_UInt)( encoding->code_last - cmap->first );
+    cmap->first   = (FT_UInt)encoding->code_first;
+    cmap->count   = (FT_UInt)encoding->code_last - cmap->first;
     cmap->indices = encoding->char_index;
 
     FT_ASSERT( cmap->indices != NULL );
     FT_ASSERT( encoding->code_first <= encoding->code_last );
 
     return 0;
   }
 
 
   FT_CALLBACK_DEF( void )
@@ skipping 84 matching lines @@
   {
     T1_Face             face    = (T1_Face)FT_CMAP_FACE( unicodes );
     FT_Memory           memory  = FT_FACE_MEMORY( face );
     FT_Service_PsCMaps  psnames = (FT_Service_PsCMaps)face->psnames;
 
     FT_UNUSED( pointer );
 
 
     return psnames->unicodes_init( memory,
                                    unicodes,
-                                   face->type1.num_glyphs,
+                                   (FT_UInt)face->type1.num_glyphs,
                                    (PS_GetGlyphNameFunc)&psaux_get_glyph_name,
                                    (PS_FreeGlyphNameFunc)NULL,
                                    (FT_Pointer)face );
   }
 
 
   FT_CALLBACK_DEF( void )
   t1_cmap_unicode_done( PS_Unicodes  unicodes )
   {
     FT_Face    face   = FT_CMAP_FACE( unicodes );
@@ skipping 37 matching lines @@
     (FT_CMap_InitFunc)     t1_cmap_unicode_init,
     (FT_CMap_DoneFunc)     t1_cmap_unicode_done,
     (FT_CMap_CharIndexFunc)t1_cmap_unicode_char_index,
     (FT_CMap_CharNextFunc) t1_cmap_unicode_char_next,
 
     NULL, NULL, NULL, NULL, NULL
   };
 
 
 /* END */